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/common.c
+22 -2
View File
@@ -998,6 +998,24 @@ INTERNAL void z_hrt_conv_gs1_brackets_nochk(struct zint_symbol *symbol, const un
symbol->text[length] = '\0';
}
#ifdef ZINT_TEST
/* For testing content segment `calloc()`/`malloc()` failures */
static int z_ct_fail_id = 0;
static int z_ct_fail_at = 0;
INTERNAL void zint_test_ct_set_fail(const int id, const int at) {
z_ct_fail_id = id;
z_ct_fail_at = at;
}
#define ct_calloc(id, num, sz) (z_ct_fail_at > 0 && z_ct_fail_id == (id) && --z_ct_fail_at == 0 \
? NULL : calloc(num, sz))
#define ct_malloc(id, sz) (z_ct_fail_at > 0 && z_ct_fail_id == (id) && --z_ct_fail_at == 0 ? NULL : malloc(sz))
#else
#define ct_calloc(id, num, sz) calloc(num, sz)
#define ct_malloc(id, sz) malloc(sz)
#endif
/* Initialize `content_segs` for `seg_count` segments. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */
INTERNAL int z_ct_init_segs(struct zint_symbol *symbol, const int seg_count) {
int i;
@@ -1005,7 +1023,8 @@ INTERNAL int z_ct_init_segs(struct zint_symbol *symbol, const int seg_count) {
if (symbol->content_segs) {
z_ct_free_segs(symbol);
}
if (!(symbol->content_segs = (struct zint_seg *) calloc((size_t) seg_count, sizeof(struct zint_seg)))) {
if (!(symbol->content_segs
= (struct zint_seg *) ct_calloc(Z_CT_FAIL_ID_INIT_SEGS, (size_t) seg_count, sizeof(struct zint_seg)))) {
return z_errtxt(ZINT_ERROR_MEMORY, symbol, 243, "Insufficient memory for content segs buffer");
}
for (i = 0; i < seg_count; i++) {
@@ -1039,7 +1058,8 @@ static int ct_init_seg_source(struct zint_symbol *symbol, const int seg_idx, con
assert(!symbol->content_segs[seg_idx].source);
assert(length > 0);
if (!(symbol->content_segs[seg_idx].source = (unsigned char *) malloc((size_t) length))) {
if (!(symbol->content_segs[seg_idx].source
= (unsigned char *) ct_malloc(Z_CT_FAIL_ID_INIT_SEG_SRC, (size_t) length))) {
return z_errtxt(ZINT_ERROR_MEMORY, symbol, 245, "Insufficient memory for content segs source buffer");
}
return 0;