Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-07-31 02:19:50 +00:00
Code Issues Projects Releases Wiki Activity

CLI: make --mirror available in standard non-batch mode via

Browse Source 
new routines `mirror_start()`, `mirror_outfile()` & limit
  substitutions on Unix to backslash (Windows remains the same);
  restrict "borderwidth", "textgap", "vwhitesp", "whitesp" < 100
CODEONE: fix `ceilf()` -> `C1_MULT_CEIL()` in FAST_MODE encodation
  (improves/changes some encodation)
composite: preserve `gs1_verify()` warning using `warn_level` hack;
  fix wrong name `zint_dbar_omnstk_set_height()` ->
  `zint_dbar_stk_set_height()`;
  use new `zint_micropdf_variant()` & `zint_micropdf_expand()`
  routines (see below)
MICROPDF417: move variant determination into new shareable routine
  `zint_micropdf_variant()` & expansion into `zint_micropdf_expand()`
qzint: add helper methods `setbordertypevalue()`,
  `encodedinputmode()`, `encodedoutputoptions()`,
  `ecivaluetoeciindex()` and `eciindextoecivalue()`
dbar: for performance pre-calculate `combins()` as array
coverage: add `malloc()`-type failure testing to AZTEC,
  CONTENT_SEGS, MEMORY_FILE, raster, Reed-Solomon & vector;
  numerous changes to remove unused code and test more branches
common: add `isxdigit()`
general: various code fiddlings
manual: add char names to sequence and batch format char tables;
  mention long options can be shortened (& use "--compliantheight"
  -> "--compliant");
  expand mirror explanation & document substitutions in footnote;
  workaround xecjk putting space after double quote when quoting
  cjk chars & rejig input mode examples;
  workaround html alignment bug in table gs1-enabled symbologies by
  adding extra rh dashes to header cols;
  add "figure nn: " to txt image tags via sed:
  various other small fixes and rephrasings
This commit is contained in:
gitlost
2026-06-23 23:25:23 +01:00
parent 4a60a0b068
commit a81c9d9258
91 changed files with 6879 additions and 4368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/gs1.c
+51 -69
View File
@@ -78,9 +78,8 @@ static int gs1_numeric(const unsigned char *data, int data_len, int offset, int
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (data_len) {
const unsigned char *d = data + offset;
@@ -128,9 +127,8 @@ static int gs1_cset82(const unsigned char *data, int data_len, int offset, int m
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (data_len) {
const unsigned char *d = data + offset;
@@ -155,9 +153,8 @@ static int gs1_cset39(const unsigned char *data, int data_len, int offset, int m
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (data_len) {
const unsigned char *d = data + offset;
@@ -182,9 +179,8 @@ static int gs1_cset64(const unsigned char *data, int data_len, int offset, int m
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (data_len) {
const unsigned char *d = data + offset;
@@ -215,9 +211,8 @@ static int gs1_csum(const unsigned char *data, int data_len, int offset, int min
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
const unsigned char *d = data + offset;
@@ -250,9 +245,9 @@ static int gs1_csumalpha(const unsigned char *data, int data_len, int offset, in
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
/* Do this check separately for backward compatibility */
if (data_len && data_len < 2) {
*p_err_no = 4;
@@ -294,9 +289,9 @@ static int gs1_gcppos1(const unsigned char *data, int data_len, int offset, int
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
/* Do this check separately for backward compatibility */
if (data_len && data_len < 2) {
*p_err_no = 4;
@@ -652,13 +647,10 @@ static int gs1_iso4217(const unsigned char *data, int data_len, int offset, int
static int gs1_pcenc(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
int *p_err_posn, char err_msg[50], const int length_only) {
static const char hex_chars[] = "0123456789ABCDEFabcdef";
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
const unsigned char *d = data + offset;
@@ -671,7 +663,8 @@ static int gs1_pcenc(const unsigned char *data, int data_len, int offset, int mi
*p_err_posn = (int) (d - data) + 1;
return gs1_err_msg_cpy_nochk(err_msg, "Invalid % escape");
}
if (strchr(hex_chars, *(++d)) == NULL || strchr(hex_chars, *(++d)) == NULL) {
d += 2;
if (!z_isxdigit(*(d - 1)) || !z_isxdigit(*d)) {
*p_err_no = 3;
*p_err_posn = (int) (d - data) + 1;
return gs1_err_msg_cpy_nochk(err_msg, "Invalid character for percent encoding");
@@ -690,9 +683,8 @@ static int gs1_yesno(const unsigned char *data, int data_len, int offset, int mi
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
if (data[offset] != '0' && data[offset] != '1') {
@@ -713,9 +705,8 @@ static int gs1_importeridx(const unsigned char *data, int data_len, int offset,
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
const unsigned char *d = data + offset;
@@ -737,9 +728,8 @@ static int gs1_nonzero(const unsigned char *data, int data_len, int offset, int
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
const int val = z_to_int(data + offset, data_len > max ? max : data_len);
@@ -761,9 +751,8 @@ static int gs1_winding(const unsigned char *data, int data_len, int offset, int
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
if (data[offset] != '0' && data[offset] != '1' && data[offset] != '9') {
@@ -783,9 +772,8 @@ static int gs1_zero(const unsigned char *data, int data_len, int offset, int min
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
if (data[offset] != '0') {
@@ -843,9 +831,9 @@ static int gs1_iban(const unsigned char *data, int data_len, int offset, int min
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
/* Do this check separately for backward compatibility */
if (data_len && data_len < 5) {
*p_err_no = 4;
@@ -920,9 +908,8 @@ static int gs1_nozeroprefix(const unsigned char *data, int data_len, int offset,
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
/* GS1 General Specifications Release 26.0 3.9.11 "The C/P serial number SHALL NOT begin with a "0" digit,
@@ -1026,9 +1013,9 @@ static int gs1_couponcode(const unsigned char *data, int data_len, int offset, i
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
/* Do separately for backward compatibility */
if (data_len && data_len < min_req_len) {
*p_err_no = 4;
@@ -1232,9 +1219,9 @@ static int gs1_couponposoffer(const unsigned char *data, int data_len, int offse
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
/* Do separately for backward compatibility */
if (data_len && (data_len < min_len || data_len > max_len)) {
*p_err_no = 4;
@@ -1365,9 +1352,8 @@ static int gs1_hyphen(const unsigned char *data, int data_len, int offset, int m
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
const unsigned char *d = data + offset;
@@ -1392,9 +1378,8 @@ static int gs1_iso5218(const unsigned char *data, int data_len, int offset, int
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
/* 0 = Not known, 1 = Male, 2 = Female, 9 = Not applicable */
@@ -1414,9 +1399,8 @@ static int gs1_posinseqslash(const unsigned char *data, int data_len, int offset
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
const unsigned char *d = data + offset;
@@ -1478,9 +1462,8 @@ static int gs1_hasnondigit(const unsigned char *data, int data_len, int offset,
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
const unsigned char *d = data + offset;
@@ -1561,9 +1544,8 @@ static int gs1_packagetype(const unsigned char *data, int data_len, int offset,
data_len = data_len < offset ? 0 : data_len - offset;
if (data_len < min) {
return 0;
}
(void)min;
assert(data_len >= min); /* Min checked before being called */
if (!length_only && data_len) {
/* Adapted from GS1 Syntax Dictionary and Linters