Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-08 04:21:59 +00:00
Code Issues Projects Releases Wiki Activity

png: ULTRA: allow for fgcolour if bind/box, bug introduced by [ed3cc5] (MR #111)

Browse Source
This commit is contained in:
gitlost
2021-05-28 14:37:57 +01:00
parent 0337548c77
commit dfb9345b75
4 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/png.c
View File

@@ -163,10 +163,22 @@ INTERNAL int png_pixel_plot(struct zint_symbol *symbol, unsigned char *pixelbuf)
num_trans = 8;
}
/* For Ultracode, have foreground only if have bind/box */
if (symbol->border_width > 0 && (symbol->output_options & (BARCODE_BIND | BARCODE_BOX))) {
/* Check whether can re-use black */
if (fg.red == 0 && fg.green == 0 && fg.blue == 0) {
map['1'] = 7; /* Re-use black */
} else {
map['1'] = num_palette;
palette[num_palette++] = fg;
if (fg_alpha != 0xff) {
trans_alpha[num_trans++] = fg_alpha;
}
}
}
/* For Ultracode, have background only if have whitespace/quiet zones */
if (pixelbuf[0] == '0' || pixelbuf[symbol->bitmap_width - 1] == '0'
|| pixelbuf[symbol->bitmap_height * (symbol->bitmap_width - 1)] == '0'
|| pixelbuf[symbol->bitmap_height * symbol->bitmap_width - 1] == '0') {
if (symbol->whitespace_width > 0 || symbol->whitespace_height > 0) { /* TODO: BARCODE_QUIET_ZONES also */
/* Check whether can re-use white */
if (bg.red == 0xff && bg.green == 0xff && bg.blue == 0xff && bg_alpha == fg_alpha) {
map['0'] = 0; /* Re-use white */