mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

zint.h: increase symbol->text size 160 -> 200;

Browse Source 
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:
gitlost
2023-11-19 19:39:54 +00:00
parent ca964f9098
commit 323b34502b
113 changed files with 2016 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
backend/qr.c
View File

@ -1014,12 +1014,11 @@ static void qr_populate_grid(unsigned char *grid, const int h_size, const int v_
}
#ifdef ZINTLOG
static int append_log(char log) {
static int append_log(unsigned char log) {
FILE *file;
file = fopen("zintlog.txt", "a+");
fprintf(file, "%c", log);
fprintf(file, "%02X", log);
(void) fclose(file);
return 0;
}
@ -1028,8 +1027,7 @@ static int write_log(char log[]) {
FILE *file;
file = fopen("zintlog.txt", "a+");
fprintf(file, log); /*writes*/
fprintf(file, "\r\n"); /*writes*/
fprintf(file, "%s\n", log); /*writes*/
(void) fclose(file);
return 0;
}
@ -1055,14 +1053,11 @@ static int qr_evaluate(unsigned char *local, const int size) {
#ifdef ZINTLOG
/* bitmask output */
for (y = 0; y < size; y++) {
strcpy(str, "");
for (x = 0; x < size; x++) {
state = local[(y * size) + x];
append_log(state);
append_log(local[(y * size) + x]);
}
write_log("");
}
write_log("");
#endif
/* Test 1: Adjacent modules in row/column in same colour */
@ -1297,6 +1292,9 @@ static int qr_apply_bitmask(unsigned char *grid, const int size, const int ecc_l
int size_squared = size * size;
unsigned char *mask = (unsigned char *) z_alloca(size_squared);
unsigned char *local = (unsigned char *) z_alloca(size_squared);
#ifdef ZINTLOG
char str[15];
#endif
/* Perform data masking */
memset(mask, 0, size_squared);
@ -1382,8 +1380,7 @@ static int qr_apply_bitmask(unsigned char *grid, const int size, const int ecc_l
}
#ifdef ZINTLOG
char str[15];
sprintf(str, "%d", best_val);
sprintf(str, "%d", best_pattern);
write_log("chose pattern:");
write_log(str);
#endif