mirror of
https://github.com/zint/zint
synced 2024-11-16 20:57:25 +13:00
zint.h: increase symbol->text
size 160 -> 200;
rename `ZINT_CAP_EXTENDABLE` -> `ZINT_CAP_EANUPC` (`ZINT_CAP_EXTENDABLE` marked as legacy) CODE128: increase no. symbol chars max 60 -> 99 EAN-2/EAN-5: fix `BARCODE_BIND_TOP/BIND/BOX` output GS1_128: warn if data > 48 (GS1 General Specifications max) common: `is_extendable()` -> `is_ucpean()` raster: add `ZFONT_HALIGN_CENTRE/LEFT/RIGHT` flags and process in `draw_string()` (for drawing EAN/UPC outside digits), and for `ZFONT_HALIGN_CENTRE` round when calculating centre (shifts some texts 1 pixel left) raster/vector: use offsets into `symbol->text` for EAN/UPC instead of `out_upcean_split_text()` (removed) BMP/EMF/GIF/PCX/PNG/PS/SVG/TIF: use new `out_colour_get_rgb()` routine (replaces `colour_to_XXX()`) general: simplify/fix some `error_number` handling/returning frontend: truncate overlong `--primary` instead of ignoring; negative floating pt option (for `--textgap`) man page: list size detail for matrix symbols (`--vers`) manual: further fiddling with scaling text; some typos
This commit is contained in:
@ -376,33 +376,12 @@ INTERNAL int gif_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
|
||||
case '1': /* standard foreground */
|
||||
RGBCur[0] = RGBfg[0]; RGBCur[1] = RGBfg[1]; RGBCur[2] = RGBfg[2];
|
||||
break;
|
||||
case 'W': /* white */
|
||||
RGBCur[0] = 255; RGBCur[1] = 255; RGBCur[2] = 255;
|
||||
default: /* Colour or error case */
|
||||
if (!out_colour_char_to_rgb(pixelColour, &RGBCur[0], &RGBCur[1], &RGBCur[2])) {
|
||||
strcpy(symbol->errtxt, "612: unknown pixel colour");
|
||||
return ZINT_ERROR_INVALID_DATA;
|
||||
}
|
||||
break;
|
||||
case 'C': /* cyan */
|
||||
RGBCur[0] = 0; RGBCur[1] = 255; RGBCur[2] = 255;
|
||||
break;
|
||||
case 'B': /* blue */
|
||||
RGBCur[0] = 0; RGBCur[1] = 0; RGBCur[2] = 255;
|
||||
break;
|
||||
case 'M': /* magenta */
|
||||
RGBCur[0] = 255; RGBCur[1] = 0; RGBCur[2] = 255;
|
||||
break;
|
||||
case 'R': /* red */
|
||||
RGBCur[0] = 255; RGBCur[1] = 0; RGBCur[2] = 0;
|
||||
break;
|
||||
case 'Y': /* yellow */
|
||||
RGBCur[0] = 255; RGBCur[1] = 255; RGBCur[2] = 0;
|
||||
break;
|
||||
case 'G': /* green */
|
||||
RGBCur[0] = 0; RGBCur[1] = 255; RGBCur[2] = 0;
|
||||
break;
|
||||
case 'K': /* black */
|
||||
RGBCur[0] = 0; RGBCur[1] = 0; RGBCur[2] = 0;
|
||||
break;
|
||||
default: /* error case - return */
|
||||
strcpy(symbol->errtxt, "612: unknown pixel colour");
|
||||
return ZINT_ERROR_INVALID_DATA;
|
||||
}
|
||||
/* Search, if RGB value is already present */
|
||||
fFound = 0;
|
||||
|
Reference in New Issue
Block a user