Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-12-18 10:27:09 +00:00
Code Issues Projects Releases Wiki Activity

general: raw_segs -> content_segs, BARCODE_RAW_TEXT ->

Browse Source 
`BARCODE_CONTENT_SEGS`, `z_rt_XXX()` -> `z_ct_XXX()`;
  move `encoded_data`/`row_height` to end of `zint_symbol`
  (see ZXing-C++ issue #883)
manual: update re `content_segs`; `my_symbol` -> `symbol`;
  improve MicroPDF417 description
This commit is contained in:
gitlost
2025-11-04 23:02:10 +00:00
parent 543696cb06
commit f0c7248b62
82 changed files with 2203 additions and 2187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/composite.c
View File

@@ -1129,7 +1129,7 @@ INTERNAL int zint_composite(struct zint_symbol *symbol, unsigned char source[],
struct zint_symbol *linear;
int top_shift, bottom_shift;
int linear_width = 0;
const int raw_text = symbol->output_options & BARCODE_RAW_TEXT;
const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS;
const int debug_print = symbol->debug & ZINT_DEBUG_PRINT;
if (debug_print) printf("Reduced length: %d\n", length);
@@ -1492,12 +1492,13 @@ INTERNAL int zint_composite(struct zint_symbol *symbol, unsigned char source[],
z_hrt_cpy_nochk(symbol, linear->text, linear->text_length);
if (raw_text) {
assert(linear->raw_segs && linear->raw_segs[0].source);
if (content_segs) {
assert(linear->content_segs && linear->content_segs[0].source);
/* First linear, then pipe '|' separator (following BWIPP & GS1 Syntax Engine), then composite */
if (z_rt_cpy_cat(symbol, linear->raw_segs[0].source, linear->raw_segs[0].length, '|', source, length)) {
if (z_ct_cpy_cat(symbol, linear->content_segs[0].source, linear->content_segs[0].length, '|', source,
length)) {
ZBarcode_Delete(linear);
return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */
return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */
}
}