Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new image type PIC #208

Closed
wants to merge 1 commit into from
Closed

Add new image type PIC #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 74 additions & 6 deletions qrenc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ enum imageType {
ANSIUTF8_TYPE,
ANSI256UTF8_TYPE,
UTF8i_TYPE,
ANSIUTF8i_TYPE
ANSIUTF8i_TYPE,
PIC_TYPE
};

static enum imageType image_type = PNG_TYPE;
Expand Down Expand Up @@ -134,8 +135,8 @@ static void usage(int help, int longopt, int status)
" specify the width of the margins. (default=4 (2 for Micro QR)))\n\n"
" -d NUMBER, --dpi=NUMBER\n"
" specify the DPI of the generated PNG. (default=72)\n\n"
" -t {PNG,PNG32,EPS,SVG,XPM,ANSI,ANSI256,ASCII,ASCIIi,UTF8,UTF8i,ANSIUTF8,ANSIUTF8i,ANSI256UTF8},\n"
" --type={PNG,PNG32,EPS,SVG,XPM,ANSI,ANSI256,ASCII,ASCIIi,UTF8,UTF8i,ANSIUTF8,ANSIUTF8i,ANSI256UTF8}\n"
" -t {PNG,PNG32,EPS,PIC,SVG,XPM,ANSI,ANSI256,ASCII,ASCIIi,UTF8,UTF8i,ANSIUTF8,ANSIUTF8i,ANSI256UTF8},\n"
" --type={PNG,PNG32,EPS,PIC,SVG,XPM,ANSI,ANSI256,ASCII,ASCIIi,UTF8,UTF8i,ANSIUTF8,ANSIUTF8i,ANSI256UTF8}\n"
" specify the type of the generated image. (default=PNG)\n"
" If ASCII*, UTF8*, or ANSI* is specified, the image will be disp-\n"
" layed in the terminal by using text characters instead of gene-\n"
Expand All @@ -152,13 +153,13 @@ static void usage(int help, int longopt, int status)
" -M, --micro encode in a Micro QR Code.\n\n"
" --rle enable run-length encoding for SVG.\n\n"
" --svg-path\n"
" use single path to draw modules for SVG.\n\n"
" use single path to draw modules for SVG or PIC.\n\n"
" --inline only useful for SVG output, generates an SVG without the XML tag.\n\n"
" --foreground=RRGGBB[AA]\n"
" --background=RRGGBB[AA]\n"
" specify foreground/background color in hexadecimal notation.\n"
" 6-digit (RGB) or 8-digit (RGBA) form are supported.\n"
" Color output support available only in PNG, EPS and SVG.\n\n"
" Color output support available only in PNG, EPS, PIC and SVG.\n\n"
" --strict-version\n"
" disable automatic version number adjustment. If the input data is\n"
" too large for the specified version, the program exits with the\n"
Expand Down Expand Up @@ -196,7 +197,7 @@ static void usage(int help, int longopt, int status)
" -v NUMBER specify the minimum version of the symbol. (default=auto)\n"
" -m NUMBER specify the width of the margins. (default=4 (2 for Micro))\n"
" -d NUMBER specify the DPI of the generated PNG. (default=72)\n"
" -t {PNG,PNG32,EPS,SVG,XPM,ANSI,ANSI256,ASCII,ASCIIi,UTF8,UTF8i,ANSIUTF8,ANSIUTF8i,ANSI256UTF8}\n"
" -t {PNG,PNG32,EPS,PIC,SVG,XPM,ANSI,ANSI256,ASCII,ASCIIi,UTF8,UTF8i,ANSIUTF8,ANSIUTF8i,ANSI256UTF8}\n"
" specify the type of the generated image. (default=PNG)\n"
" -S make structured symbols. Version number must be specified with '-v'.\n"
" -k assume that the input text contains kanji (shift-jis).\n"
Expand Down Expand Up @@ -524,6 +525,65 @@ static int writeEPS(const QRcode *qrcode, const char *outfile)
return 0;
}

static void writePIC_drawModules(FILE *fp, int x, int y, int width, const char* col)
{
fprintf(fp, "P(%d,%d,%d,boxht,\"%s\")\n", x, y, width, col);
}

static int writePIC(const QRcode *qrcode, const char *outfile)
{
FILE *fp;
unsigned char *row, *p;
int x, y;
int symwidth;
float scale;
char fg[7], bg[7];

fp = openFile(outfile);

scale = dpi * INCHES_PER_METER / 100.0;

symwidth = qrcode->width + margin * 2;

snprintf(fg, 7, "%02x%02x%02x", fg_color[0], fg_color[1], fg_color[2]);
snprintf(bg, 7, "%02x%02x%02x", bg_color[0], bg_color[1], bg_color[2]);

/* Vanity remark */
fprintf(fp, "# Created with qrencode %s (https://fukuchi.org/works/qrencode/index.html)\n", QRcode_APIVersionString());

fprintf(fp, "command \".if !mqrcode_fg .defcolor qrcode_fg rgb #%s\"\n", fg);
fprintf(fp, "command \".if !mqrcode_bg .defcolor qrcode_bg rgb #%s\"\n", bg);
if (svg_path) {
fputs("command \".nop \\X'ps: exec 0 setlinecap'\\c\"\n", fp);
fputs("command \".nop \\X'ps: exec 0 setlinejoin'\\c\"\n", fp);
fprintf(fp, "linethick=%d\n", size);
}

fprintf(fp, "maxpswid=%1$d;maxpsht=%1$d;movewid=0;moveht=1;boxwid=1;boxht=1\n", symwidth);
if(svg_path) {
fputs("define P { line left $3 color $5 at $1+4,-$2-4 }\n", fp);
} else {
fputs("define P { box wid $3 ht $4 color $5 with .nw at $1+4,-$2-4 }\n", fp);
}
fputs("box wid maxpswid ht maxpsht color \"qrcode_bg\" with .nw at 0,0\n", fp);

/* Write data */
p = qrcode->data;
for(y = 0; y < qrcode->width; y++) {
row = (p+(y*qrcode->width));

for(x = 0; x < qrcode->width; x++) {
if(*(row+x)&0x1) {
writePIC_drawModules(fp, x, y, 1, "qrcode_fg");
}
}
}

fclose(fp);

return 0;
}

static void writeSVG_drawModules(FILE *fp, int x, int y, int width, const char* col, double opacity)
{
if(svg_path) {
Expand Down Expand Up @@ -1062,6 +1122,9 @@ static void qrencode(const unsigned char *intext, int length, const char *outfil
case EPS_TYPE:
writeEPS(qrcode, outfile);
break;
case PIC_TYPE:
writePIC(qrcode, outfile);
break;
case SVG_TYPE:
writeSVG(qrcode, outfile);
break;
Expand Down Expand Up @@ -1128,6 +1191,9 @@ static void qrencodeStructured(const unsigned char *intext, int length, const ch
case EPS_TYPE:
type_suffix = ".eps";
break;
case PIC_TYPE:
type_suffix = ".pic";
break;
case SVG_TYPE:
type_suffix = ".svg";
break;
Expand Down Expand Up @@ -1322,6 +1388,8 @@ int main(int argc, char **argv)
image_type = PNG_TYPE;
} else if(strcasecmp(optarg, "eps") == 0) {
image_type = EPS_TYPE;
} else if(strcasecmp(optarg, "pic") == 0) {
image_type = PIC_TYPE;
} else if(strcasecmp(optarg, "svg") == 0) {
image_type = SVG_TYPE;
} else if(strcasecmp(optarg, "xpm") == 0) {
Expand Down
8 changes: 4 additions & 4 deletions qrencode.1.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ specify the width of margin. (default=4)
specify the DPI of the generated PNG. (default=72)
.TP
.PD 0
.B \-t {PNG,PNG32,EPS,SVG,XPM,ANSI,ANSI256,ASCII,ASCIIi,UTF8,UTF8i,ANSIUTF8,ANSIUTF8i,ANSI256UTF8}
.B \-t {PNG,PNG32,EPS,PIC,SVG,XPM,ANSI,ANSI256,ASCII,ASCIIi,UTF8,UTF8i,ANSIUTF8,ANSIUTF8i,ANSI256UTF8}
.TP
.PD
.B \-\-type={PNG,PNG32,EPS,SVG,XPM,ANSI,ANSI256,ASCII,ASCIIi,UTF8,UTF8i,ANSIUTF8,ANSIUTF8i,ANSI256UTF8}
.B \-\-type={PNG,PNG32,EPS,PIC,SVG,XPM,ANSI,ANSI256,ASCII,ASCIIi,UTF8,UTF8i,ANSIUTF8,ANSIUTF8i,ANSI256UTF8}
specify the type of the generated image. (default=PNG)
.br
If ASCII*, UTF8*, or ANSI* is specified, the image will be displayed in the terminal by using
Expand Down Expand Up @@ -75,7 +75,7 @@ encode in a Micro QR Code. See MICRO QR CODE for more information.
enable run-length encoding for SVG.
.TP
.B \-\-svg-path
use single path to draw modules for SVG.
use single path to draw modules for SVG or PIC.
.TP
.B \-\-inline
only useful for SVG output, generates an SVG without the XML tag.
Expand All @@ -87,7 +87,7 @@ only useful for SVG output, generates an SVG without the XML tag.
.B \-\-background=RRGGBB[AA]
specify foreground/background color in hexadecimal notation.
6-digit (RGB) or 8-digit (RGBA) form are supported.
Color output support available only in PNG, EPS and SVG.
Color output support available only in PNG, EPS, PIC and SVG.
.TP
.B \-\-strict\-version
disable automatic version number adjustment. If the input data is
Expand Down