mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-29 22:35:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

general: change BARCODE_RAW_TEXT to write to new zint_symbol

Browse source 
fields `raw_segs` and `raw_seg_count` instead of `text`, and to
  do so for all symbologies, using new common funcs `rt_cpy()` etc.
MICROPDF417: return ECC percentage in top byte of `option_1`
DBAR_EXP_STK: return `option_2`/`option_3` feedback
CLI: change warning text "ignoring" -> "**IGNORED**"
GUI: show feedback for DBAR_EXP_STK, MICROPDF417, UPNQR
ctest: fix recent inability to run tests via "ctest" on Windows
  (MSVC) by using cmake 3.22 feature `ENVIRONMENT_MODIFICATION`
manual: document feedback and RAW_TEXT in new "Feedback" section;
  rephrase some symbology descriptions
test suite: new general-use arg "-a"; add `func_name` to context;
  new "test_bwipp" test for testing BWIPP against ZXing-C++
This commit is contained in:
gitlost 2025-03-28 10:02:19 +00:00
parent d1bf02e156
commit a6c225447e
120 changed files with 10511 additions and 5620 deletions
Download patch file Download diff file Expand all files Collapse all files

31
backend/ultra.c
View file

@ -792,7 +792,7 @@ static int ult_generate_codewords(struct zint_symbol *symbol, const unsigned cha
/* Call `ult_generate_codewords()` for each segment, dealing with symbol mode and start codeword beforehand */
static int ult_generate_codewords_segs(struct zint_symbol *symbol, struct zint_seg segs[], const int seg_count,
int codewords[]) {
int codewords[], int *p_data_cw_count) {
int i;
int codeword_count = 0;
int symbol_mode;
@ -802,6 +802,8 @@ static int ult_generate_codewords_segs(struct zint_symbol *symbol, struct zint_s
int length = segs[0].length;
const int eci = segs[0].eci;
const int gs1 = (symbol->input_mode & 0x07) == GS1_MODE;
/* GS1 raw text dealt with by `ZBarcode_Encode_Segs()` */
const int raw_text = !gs1 && (symbol->output_options & BARCODE_RAW_TEXT);
for (i = 0; i < seg_count; i++) {
if (segs[i].eci) {
@ -904,12 +906,21 @@ static int ult_generate_codewords_segs(struct zint_symbol *symbol, struct zint_s
codeword_count = ult_generate_codewords(symbol, source, length, 0 /*eci*/, gs1, symbol_mode, &current_mode,
codewords, codeword_count);
if (raw_text && (rt_init_segs(symbol, seg_count) || rt_cpy_seg(symbol, 0, &segs[0]))) {
return ZINT_ERROR_MEMORY; /* `rt_init_segs()` & `rt_cpy_seg()` only fail with OOM */
}
for (i = 1; i < seg_count; i++) {
codeword_count = ult_generate_codewords(symbol, segs[i].source, segs[i].length, segs[i].eci, gs1, symbol_mode,
&current_mode, codewords, codeword_count);
if (raw_text && rt_cpy_seg(symbol, i, &segs[i])) {
return ZINT_ERROR_MEMORY; /* `rt_cpy_seg()` only fails with OOM */
}
}
return codeword_count;
*p_data_cw_count = codeword_count;
return 0;
}
INTERNAL int ultra(struct zint_symbol *symbol, struct zint_seg segs[], const int seg_count) {
@ -921,7 +932,7 @@ INTERNAL int ultra(struct zint_symbol *symbol, struct zint_seg segs[], const int
int rows, columns;
int total_cws;
int pads;
int cw_memalloc;
int cw_alloc;
/* Allow for 3 pads in final 57th (60th incl. clock tracks) column of 5-row symbol (57 * 5 == 285) */
int codeword[282 + 3];
int i, j, locn;
@ -934,8 +945,6 @@ INTERNAL int ultra(struct zint_symbol *symbol, struct zint_seg segs[], const int
int *data_codewords;
char *pattern;
(void)seg_count;
if (symbol->eci > 811799) {
return errtxtf(ZINT_ERROR_INVALID_OPTION, symbol, 590, "ECI code '%d' out of range (0 to 811799)",
symbol->eci);
@ -984,14 +993,16 @@ INTERNAL int ultra(struct zint_symbol *symbol, struct zint_seg segs[], const int
scr[0] = link2 * 70 + (symbol->structapp.count - 1) * 8 + symbol->structapp.index - 1;
}
cw_memalloc = segs_length(segs, seg_count) * 2;
if (cw_memalloc < 283) {
cw_memalloc = 283;
cw_alloc = segs_length(segs, seg_count) * 2;
if (cw_alloc < 283) {
cw_alloc = 283;
}
data_codewords = (int *) z_alloca(sizeof(int) * cw_memalloc);
data_codewords = (int *) z_alloca(sizeof(int) * cw_alloc);
data_cw_count = ult_generate_codewords_segs(symbol, segs, seg_count, data_codewords);
if (ult_generate_codewords_segs(symbol, segs, seg_count, data_codewords, &data_cw_count)) {
return ZINT_ERROR_MEMORY; /* `ult_generate_codewords_segs()` only returns non-zero if OOM */
}
if (debug_print) {
printf("Codewords (%d):", data_cw_count);