Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-09 13:05:58 +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

12
backend/aztec.c
View File

@@ -680,15 +680,15 @@ static int aztec_text_process_segs(struct zint_symbol *symbol, struct zint_seg s
char current_mode = 'U';
/* Raw text dealt with by `ZBarcode_Encode_Segs()`, except for `eci` feedback.
Note not updating `eci` for GS1 mode as not converted */
const int raw_text = !gs1 && (symbol->output_options & BARCODE_RAW_TEXT);
const int content_segs = !gs1 && (symbol->output_options & BARCODE_CONTENT_SEGS);
for (i = 0; i < seg_count; i++) {
if (!aztec_text_process(segs[i].source, segs[i].length, bp, binary_string, gs1, gs1_bp, segs[i].eci,
&current_mode, &bp, debug_print)) {
return ZINT_ERROR_TOO_LONG; /* `aztec_text_process()` only fails with too long */
}
if (raw_text && segs[i].eci) {
z_rt_set_seg_eci(symbol, i, segs[i].eci);
if (content_segs && segs[i].eci) {
z_ct_set_seg_eci(symbol, i, segs[i].eci);
}
}
@@ -1301,7 +1301,7 @@ INTERNAL int zint_azrune(struct zint_symbol *symbol, unsigned char source[], int
unsigned char data_codewords[3], ecc_codewords[6];
int bp = 0;
rs_t rs;
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 (length > 3) {
@@ -1353,8 +1353,8 @@ INTERNAL int zint_azrune(struct zint_symbol *symbol, unsigned char source[], int
symbol->rows = 11;
symbol->width = 11;
if (raw_text && z_rt_printf_256(symbol, "%03d", input_value)) {
return ZINT_ERROR_MEMORY; /* `z_rt_printf_256()` only fails with OOM */
if (content_segs && z_ct_printf_256(symbol, "%03d", input_value)) {
return ZINT_ERROR_MEMORY; /* `z_ct_printf_256()` only fails with OOM */
}
return 0;