diff --git a/ChangeLog b/ChangeLog index 01da6d05..63a4f6fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Version 2.15.0.9 (dev) not released yet (2025-10-16) +Version 2.15.0.9 (dev) not released yet (2025-11-04) ==================================================== **Incompatible changes** @@ -7,8 +7,8 @@ Version 2.15.0.9 (dev) not released yet (2025-10-16) treated as-is, i.e. as binary bytes - this now requires `DATA_MODE`) - Buffer length of member `errtxt` in `zint_symbol` extended 100 -> 160 (client buffers may need checking/extending) -- New `raw_segs` & `raw_seg_count` fields in `zint_symbol` for use with new - output option `BARCODE_RAW_TEXT` +- New `content_segs` & `content_seg_count` fields in `zint_symbol` for use with + new output option `BARCODE_CONTENT_SEGS` - Symbol structure members `option_1`, `option_2` and `option_3` now updated after `ZBarcode_Encode()` and variants are called, and there are three new methods in the Qt Backend to access to them @@ -24,9 +24,9 @@ Version 2.15.0.9 (dev) not released yet (2025-10-16) Changes ------- -- Add new `BARCODE_RAW_TEXT` option for `output_options` which sets new fields - `raw_segs` and `raw_seg_count` with encoded data (pre-converted, i.e. UTF-8 - unless input mode is `DATA_MODE`) +- Add new `BARCODE_CONTENT_SEGS` option for `output_options` which sets new + fields `content_segs` and `content_seg_count` with encoded data + (pre-converted, i.e. UTF-8 unless input mode is `DATA_MODE`) - Add API funcs `ZBarcode_UTF8_To_ECI()` and `ZBarcode_Dest_Len_ECI()` - Set `option_1`, `option_2`, `option_3` to values used in encodation, and add new access methods `encodedOption1()` etc. to Qt Backend, and use in GUI to diff --git a/backend/2of5.c b/backend/2of5.c index 4465a8e8..aafee388 100644 --- a/backend/2of5.c +++ b/backend/2of5.c @@ -62,7 +62,7 @@ static int c25_common(struct zint_symbol *symbol, const unsigned char source[], char *d = dest; unsigned char local_source[113 + 1]; /* Largest maximum 113 + optional check digit */ const int have_checkdigit = symbol->option_2 == 1 || symbol->option_2 == 2; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > max) { /* errtxt 301: 303: 305: 307: */ @@ -108,8 +108,8 @@ static int c25_common(struct zint_symbol *symbol, const unsigned char source[], /* Exclude check digit from HRT if hidden */ z_hrt_cpy_nochk(symbol, local_source, length - (symbol->option_2 == 2)); - if (raw_text && z_rt_cpy(symbol, local_source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, local_source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return 0; diff --git a/backend/2of5inter.c b/backend/2of5inter.c index fe6b3d38..83d27105 100644 --- a/backend/2of5inter.c +++ b/backend/2of5inter.c @@ -50,7 +50,7 @@ INTERNAL int zint_c25_inter_common(struct zint_symbol *symbol, unsigned char sou char *d = dest; unsigned char local_source[125 + 1]; const int have_checkdigit = checkdigit_option == 1 || checkdigit_option == 2; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 125) { /* 4 + (125 + 1) * 9 + 5 = 1143 */ return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 309, "Input length %d too long (maximum 125)", length); @@ -120,8 +120,8 @@ INTERNAL int zint_c25_inter_common(struct zint_symbol *symbol, unsigned char sou /* Exclude check digit from HRT if hidden */ z_hrt_cpy_nochk(symbol, local_source, length - (symbol->option_2 == 2)); - if (raw_text && z_rt_cpy(symbol, local_source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, local_source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; diff --git a/backend/auspost.c b/backend/auspost.c index 91c1c6f4..8f6b2f15 100644 --- a/backend/auspost.c +++ b/backend/auspost.c @@ -124,7 +124,7 @@ INTERNAL int zint_auspost(struct zint_symbol *symbol, unsigned char source[], in unsigned char fcc[2] = {0}; /* Suppress clang-tidy warning clang-analyzer-core.UndefinedBinaryOperatorResult */ unsigned char local_source[30]; int zeroes = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; /* Suppress clang-tidy-21 clang-analyzer-security.ArrayBound */ assert(symbol->symbology == BARCODE_AUSPOST || symbol->symbology == BARCODE_AUSREPLY @@ -281,8 +281,8 @@ INTERNAL int zint_auspost(struct zint_symbol *symbol, unsigned char source[], in symbol->rows = 3; /* Not stackable */ symbol->width = writer - 1; - if (raw_text && z_rt_cpy_cat(symbol, fcc, 2, '\xFF' /*separator (none)*/, local_source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (content_segs && z_ct_cpy_cat(symbol, fcc, 2, '\xFF' /*separator (none)*/, local_source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; diff --git a/backend/aztec.c b/backend/aztec.c index f15d48c2..28874892 100644 --- a/backend/aztec.c +++ b/backend/aztec.c @@ -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, ¤t_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; diff --git a/backend/bc412.c b/backend/bc412.c index 67257271..79074989 100644 --- a/backend/bc412.c +++ b/backend/bc412.c @@ -72,7 +72,7 @@ INTERNAL int zint_bc412(struct zint_symbol *symbol, unsigned char source[], int char dest[293]; /* 2 + (36 * 8) + 3 */ char *d = dest; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 18) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 790, "Input length %d too long (maximum 18)", length); @@ -147,8 +147,8 @@ INTERNAL int zint_bc412(struct zint_symbol *symbol, unsigned char source[], int z_hrt_cpy_nochk(symbol, padded_source, length + 1); - if (raw_text && z_rt_cpy(symbol, padded_source, length + 1)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, padded_source, length + 1)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; diff --git a/backend/channel.c b/backend/channel.c index 55fb5b1e..06d93dee 100644 --- a/backend/channel.c +++ b/backend/channel.c @@ -181,7 +181,7 @@ INTERNAL int zint_channel(struct zint_symbol *symbol, unsigned char source[], in char *d = dest; int channels, i; int error_number = 0, zeroes; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 7) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 333, "Input length %d too long (maximum 7)", length); @@ -254,8 +254,8 @@ INTERNAL int zint_channel(struct zint_symbol *symbol, unsigned char source[], in zeroes = channels - 1 - length; z_hrt_cpy_cat_nochk(symbol, zeroes_str, zeroes, '\xFF' /*separator (none)*/, source, length); - if (raw_text && z_rt_cpy_cat(symbol, zeroes_str, zeroes, '\xFF' /*separator (none)*/, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (content_segs && z_ct_cpy_cat(symbol, zeroes_str, zeroes, '\xFF' /*separator (none)*/, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; } diff --git a/backend/codabar.c b/backend/codabar.c index 5eb393d6..4ba1e6e2 100644 --- a/backend/codabar.c +++ b/backend/codabar.c @@ -58,7 +58,7 @@ INTERNAL int zint_codabar(struct zint_symbol *symbol, unsigned char source[], in char *d = dest; int add_checksum, count = 0, checksum = 0; int d_chars = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 103) { /* No stack smashing please (103 + 1) * 11 = 1144 */ return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 356, "Input length %d too long (maximum 103)", length); @@ -138,9 +138,9 @@ INTERNAL int zint_codabar(struct zint_symbol *symbol, unsigned char source[], in z_hrt_cpy_cat_nochk(symbol, source, length - 1, (char) (symbol->option_2 == 2 ? CALCIUM[checksum] : '\xFF'), source + length - 1, 1); - if (raw_text && z_rt_cpy_cat(symbol, source, length - 1, + if (content_segs && z_ct_cpy_cat(symbol, source, length - 1, (char) (add_checksum ? CALCIUM[checksum] : '\xFF'), source + length - 1, 1)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; diff --git a/backend/codablock.c b/backend/codablock.c index 5f9c1eb7..7abcdcd7 100644 --- a/backend/codablock.c +++ b/backend/codablock.c @@ -550,7 +550,7 @@ INTERNAL int zint_codablockf(struct zint_symbol *symbol, unsigned char source[], unsigned char *data; int *pSet; uchar *pOutput; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; const int debug = symbol->debug & ZINT_DEBUG_PRINT; /* Suppresses clang-analyzer-core.VLASize warning */ @@ -567,7 +567,7 @@ INTERNAL int zint_codablockf(struct zint_symbol *symbol, unsigned char source[], symbol->border_width = 1; /* AIM ISS-X-24 Section 4.6.1 b) (note change from previous default 2) */ } z_hrt_cpy_nochk(symbol, ZCUCP(""), 0); /* Zap HRT for compatibility with CODABLOCKF */ - /* Use `raw_text` from `zint_code128()` */ + /* Use `content_segs` from `zint_code128()` */ if (symbol->output_options & COMPLIANT_HEIGHT) { /* AIM ISS-X-24 Section 4.6.1 minimum row height 8X (for compatibility with CODABLOCKF, not specced for CODE128) */ @@ -882,13 +882,13 @@ INTERNAL int zint_codablockf(struct zint_symbol *symbol, unsigned char source[], symbol->border_width = 1; /* AIM ISS-X-24 Section 4.6.1 b) (note change from previous default 2) */ } - if (raw_text) { + if (content_segs) { if ((symbol->input_mode & 0x07) == DATA_MODE) { - if (z_rt_cpy(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (z_ct_cpy(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } - } else if (z_rt_cpy_iso8859_1(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_iso8859_1()` only fails with OOM */ + } else if (z_ct_cpy_iso8859_1(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_iso8859_1()` only fails with OOM */ } } diff --git a/backend/code.c b/backend/code.c index 092b6939..cb5cc5d7 100644 --- a/backend/code.c +++ b/backend/code.c @@ -127,7 +127,7 @@ INTERNAL int zint_code39(struct zint_symbol *symbol, unsigned char source[], int char *d = dest; char check_digit = '\0'; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (symbol->option_2 < 0 || symbol->option_2 > 2) { symbol->option_2 = 0; @@ -227,10 +227,10 @@ INTERNAL int zint_code39(struct zint_symbol *symbol, unsigned char source[], int NULL /*cat*/, 0); } - if (raw_text) { - if (z_rt_cpy_cat(symbol, source, length, + if (content_segs) { + if (z_ct_cpy_cat(symbol, source, length, (char) (check_digit ? check_digit == '_' ? ' ' : check_digit : '\xFF'), NULL /*cat*/, 0)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } } @@ -245,7 +245,7 @@ INTERNAL int zint_excode39(struct zint_symbol *symbol, unsigned char source[], i unsigned char check_digit = '\0'; int error_number; const int saved_option_2 = symbol->option_2; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 86) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 328, "Input length %d too long (maximum 86)", length); @@ -270,8 +270,8 @@ INTERNAL int zint_excode39(struct zint_symbol *symbol, unsigned char source[], i if (saved_option_2 == 2) { symbol->option_2 = 1; /* Make hidden check digit visible so returned in HRT */ } - if (raw_text) { - symbol->output_options &= ~BARCODE_RAW_TEXT; /* Don't use `zint_code39()`'s `raw_text` */ + if (content_segs) { + symbol->output_options &= ~BARCODE_CONTENT_SEGS; /* Don't use `zint_code39()`'s `content_segs` */ } /* Then send the buffer to the C39 function */ @@ -282,12 +282,12 @@ INTERNAL int zint_excode39(struct zint_symbol *symbol, unsigned char source[], i if (saved_option_2 == 2) { symbol->option_2 = 2; /* Restore */ } - if (raw_text) { - symbol->output_options |= BARCODE_RAW_TEXT; /* Restore */ + if (content_segs) { + symbol->output_options |= BARCODE_CONTENT_SEGS; /* Restore */ } - /* Save visible (or BARCODE_RAW_TEXT) check digit */ - if (symbol->option_2 == 1 || (raw_text && symbol->option_2 == 2)) { + /* Save visible (or BARCODE_CONTENT_SEGS) check digit */ + if (symbol->option_2 == 1 || (content_segs && symbol->option_2 == 2)) { check_digit = symbol->text[symbol->text_length - 1]; } @@ -297,10 +297,10 @@ INTERNAL int zint_excode39(struct zint_symbol *symbol, unsigned char source[], i z_hrt_cat_chr_nochk(symbol, check_digit); } - if (raw_text && z_rt_cpy_cat(symbol, source, length, + if (content_segs && z_ct_cpy_cat(symbol, source, length, (char) (check_digit ? check_digit == '_' ? ' ' : check_digit : '\xFF'), NULL /*cat*/, 0)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; @@ -320,7 +320,7 @@ INTERNAL int zint_code93(struct zint_symbol *symbol, unsigned char source[], int char *b = buffer; char dest[764]; /* 6 (Start) + 123*6 + 2*6 (Checks) + 7 (Stop) + 1 (NUL) = 764 */ char *d = dest; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; /* Suppresses clang-tidy clang-analyzer-core.CallAndMessage warning */ assert(length > 0); @@ -413,8 +413,8 @@ INTERNAL int zint_code93(struct zint_symbol *symbol, unsigned char source[], int z_hrt_cat_chr_nochk(symbol, SILVER[k]); } - if (raw_text && z_rt_cpy_cat(symbol, source, length, SILVER[c], (const unsigned char *) SILVER + k, 1)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (content_segs && z_ct_cpy_cat(symbol, source, length, SILVER[c], (const unsigned char *) SILVER + k, 1)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; @@ -431,7 +431,7 @@ INTERNAL int zint_vin(struct zint_symbol *symbol, unsigned char source[], int le char output_check; int sum; int i; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; static const char weight[17] = { 8, 7, 6, 5, 4, 3, 2, 10, 0, 9, 8, 7, 6, 5, 4, 3, 2 }; /* Check length */ @@ -508,9 +508,9 @@ INTERNAL int zint_vin(struct zint_symbol *symbol, unsigned char source[], int le z_hrt_cpy_nochk(symbol, source, length); - if (raw_text && z_rt_cpy_cat(symbol, NULL /*source*/, 0, (char) (symbol->option_2 == 1 ? 'I' : '\xFF'), + if (content_segs && z_ct_cpy_cat(symbol, NULL /*source*/, 0, (char) (symbol->option_2 == 1 ? 'I' : '\xFF'), source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } /* Specification of dimensions/height for BARCODE_VIN unlikely */ diff --git a/backend/code1.c b/backend/code1.c index e4e9c378..d1bbbc3b 100644 --- a/backend/code1.c +++ b/backend/code1.c @@ -984,12 +984,12 @@ static int c1_encode_segs(struct zint_symbol *symbol, struct zint_seg segs[], co int tp = 0; /* Raw text dealt with by `ZBarcode_Encode_Segs()`, except for `eci` feedback. Note not updating `eci` for GS1 mode as not converted (and ignored & not written anyway) */ - 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++) { tp = c1_encode(symbol, segs[i].source, segs[i].length, segs[i].eci, seg_count, gs1, target, &tp, p_last_mode); - 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); } } diff --git a/backend/code11.c b/backend/code11.c index 87702295..7bd2ad62 100644 --- a/backend/code11.c +++ b/backend/code11.c @@ -56,7 +56,7 @@ INTERNAL int zint_code11(struct zint_symbol *symbol, unsigned char source[], int int num_check_digits; unsigned char checkstr[2]; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; /* Suppresses clang-tidy clang-analyzer-core.UndefinedBinaryOperatorResult warning */ assert(length > 0); @@ -151,8 +151,9 @@ INTERNAL int zint_code11(struct zint_symbol *symbol, unsigned char source[], int z_hrt_cat_nochk(symbol, checkstr, num_check_digits); } - if (raw_text && z_rt_cpy_cat(symbol, source, length, '\xFF' /*separator (none)*/, checkstr, num_check_digits)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (content_segs && z_ct_cpy_cat(symbol, source, length, '\xFF' /*separator (none)*/, checkstr, + num_check_digits)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; diff --git a/backend/code128.c b/backend/code128.c index 2badcb08..24e357cb 100644 --- a/backend/code128.c +++ b/backend/code128.c @@ -381,7 +381,7 @@ INTERNAL int zint_code128(struct zint_symbol *symbol, unsigned char source[], in unsigned char *src = source; const int ab_only = symbol->symbology == BARCODE_CODE128AB; const int start_idx = (symbol->output_options & READER_INIT) ? 2 : 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; assert(length); /* Suppress clang-tidy-20.1 warning clang-analyzer-optin.portability.UnixAPI */ @@ -497,13 +497,13 @@ INTERNAL int zint_code128(struct zint_symbol *symbol, unsigned char source[], in } error_number = z_hrt_cpy_iso8859_1(symbol, src, length); /* Returns warning only */ - if (raw_text) { + if (content_segs) { if ((symbol->input_mode & 0x07) == DATA_MODE) { - if (z_rt_cpy(symbol, src, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (z_ct_cpy(symbol, src, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } - } else if (z_rt_cpy_iso8859_1(symbol, src, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_iso8859_1()` only fails with OOM */ + } else if (z_ct_cpy_iso8859_1(symbol, src, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_iso8859_1()` only fails with OOM */ } } @@ -524,7 +524,7 @@ INTERNAL int zint_gs1_128_cc(struct zint_symbol *symbol, unsigned char source[], int separator_row = 0; int reduced_length; unsigned char *reduced = (unsigned char *) z_alloca(length + 1); - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > C128_MAX) { /* This only blocks ridiculously long input - the actual length of the @@ -654,8 +654,8 @@ INTERNAL int zint_gs1_128_cc(struct zint_symbol *symbol, unsigned char source[], z_hrt_conv_gs1_brackets_nochk(symbol, source, length); } - if (raw_text && z_rt_cpy(symbol, reduced, reduced_length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, reduced, reduced_length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; diff --git a/backend/code16k.c b/backend/code16k.c index 8331430a..df8bd9ee 100644 --- a/backend/code16k.c +++ b/backend/code16k.c @@ -335,7 +335,7 @@ INTERNAL int zint_code16k(struct zint_symbol *symbol, unsigned char source[], in int error_number = 0, first_sum, second_sum; 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); + const int content_segs = !gs1 && (symbol->output_options & BARCODE_CONTENT_SEGS); const int debug_print = symbol->debug & ZINT_DEBUG_PRINT; if (length > C128_MAX) { @@ -593,13 +593,13 @@ INTERNAL int zint_code16k(struct zint_symbol *symbol, unsigned char source[], in symbol->border_width = 1; /* BS EN 12323:2005 Section 4.3.7 minimum (note change from previous default 2) */ } - if (raw_text) { + if (content_segs) { if ((symbol->input_mode & 0x07) == DATA_MODE) { - if (z_rt_cpy(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (z_ct_cpy(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } - } else if (z_rt_cpy_iso8859_1(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_iso8859_1()` only fails with OOM */ + } else if (z_ct_cpy_iso8859_1(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_iso8859_1()` only fails with OOM */ } } diff --git a/backend/code49.c b/backend/code49.c index b60b4751..2ab1da02 100644 --- a/backend/code49.c +++ b/backend/code49.c @@ -51,7 +51,7 @@ INTERNAL int zint_code49(struct zint_symbol *symbol, unsigned char source[], int int gs1; int h; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 81) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 430, "Input length %d too long (maximum 81)", length); @@ -373,8 +373,8 @@ INTERNAL int zint_code49(struct zint_symbol *symbol, unsigned char source[], int symbol->border_width = 1; /* ANSI/AIM BC6-2000 Section 2.1 (note change from previous default 2) */ } - if (!gs1 && raw_text && z_rt_cpy(symbol, source, length)) { /* GS1 dealt with by `ZBarcode_Encode_Segs()` */ - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (!gs1 && content_segs && z_ct_cpy(symbol, source, length)) { /* GS1 dealt with by `ZBarcode_Encode_Segs()` */ + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; diff --git a/backend/common.c b/backend/common.c index 43a0c0c5..aaf23603 100644 --- a/backend/common.c +++ b/backend/common.c @@ -913,107 +913,107 @@ INTERNAL void z_hrt_conv_gs1_brackets_nochk(struct zint_symbol *symbol, const un symbol->text[length] = '\0'; } -/* Initialize `raw_segs` for `seg_count` segments. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_init_segs(struct zint_symbol *symbol, const int seg_count) { +/* 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; - if (symbol->raw_segs) { - z_rt_free_segs(symbol); + if (symbol->content_segs) { + z_ct_free_segs(symbol); } - if (!(symbol->raw_segs = (struct zint_seg *) calloc((size_t) seg_count, sizeof(struct zint_seg)))) { - return z_errtxt(ZINT_ERROR_MEMORY, symbol, 243, "Insufficient memory for raw segs buffer"); + if (!(symbol->content_segs = (struct zint_seg *) calloc((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++) { - symbol->raw_segs[i].source = NULL; + symbol->content_segs[i].source = NULL; } - symbol->raw_seg_count = seg_count; + symbol->content_seg_count = seg_count; return 0; } -/* Free `raw_segs` along with any `source` buffers */ -INTERNAL void z_rt_free_segs(struct zint_symbol *symbol) { - if (symbol->raw_segs) { +/* Free `content_segs` along with any `source` buffers */ +INTERNAL void z_ct_free_segs(struct zint_symbol *symbol) { + if (symbol->content_segs) { int i; - assert(symbol->raw_seg_count); - for (i = 0; i < symbol->raw_seg_count; i++) { - if (symbol->raw_segs[i].source) { - free(symbol->raw_segs[i].source); + assert(symbol->content_seg_count); + for (i = 0; i < symbol->content_seg_count; i++) { + if (symbol->content_segs[i].source) { + free(symbol->content_segs[i].source); } } - free(symbol->raw_segs); - symbol->raw_segs = NULL; + free(symbol->content_segs); + symbol->content_segs = NULL; } - symbol->raw_seg_count = 0; + symbol->content_seg_count = 0; } -/* Helper to initialize `raw_segs[seg_idx]` to receive text of `length` */ -static int rt_init_seg_source(struct zint_symbol *symbol, const int seg_idx, const int length) { - assert(symbol->raw_segs); - assert(seg_idx >= 0 && seg_idx < symbol->raw_seg_count); - assert(!symbol->raw_segs[seg_idx].source); +/* Helper to initialize `content_segs[seg_idx]` to receive text of `length` */ +static int ct_init_seg_source(struct zint_symbol *symbol, const int seg_idx, const int length) { + assert(symbol->content_segs); + assert(seg_idx >= 0 && seg_idx < symbol->content_seg_count); + assert(!symbol->content_segs[seg_idx].source); assert(length > 0); - if (!(symbol->raw_segs[seg_idx].source = (unsigned char *) malloc((size_t) length))) { - return z_errtxt(ZINT_ERROR_MEMORY, symbol, 245, "Insufficient memory for raw text source buffer"); + if (!(symbol->content_segs[seg_idx].source = (unsigned char *) malloc((size_t) length))) { + return z_errtxt(ZINT_ERROR_MEMORY, symbol, 245, "Insufficient memory for content text source buffer"); } return 0; } -/* Copy `segs` to raw segs. Seg source copied as-is. If seg length <= 0, raw reg length set to `strlen()`. - If seg eci not set, raw seg eci set to 3. On error sets `errxtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_cpy_segs(struct zint_symbol *symbol, const struct zint_seg segs[], const int seg_count) { +/* Copy `segs` to content segs. Seg source copied as-is. If seg length <= 0, content reg length set to `strlen()`. + If seg eci not set, content seg eci set to 3. On error sets `errxtxt`, returning BARCODE_ERROR_MEMORY */ +INTERNAL int z_ct_cpy_segs(struct zint_symbol *symbol, const struct zint_seg segs[], const int seg_count) { int seg_idx; - assert(!symbol->raw_segs); /* Trap unintended double setting */ - if (z_rt_init_segs(symbol, seg_count)) { - return ZINT_ERROR_MEMORY; /* `z_rt_init_segs()` only fails with OOM */ + assert(!symbol->content_segs); /* Trap unintended double setting */ + if (z_ct_init_segs(symbol, seg_count)) { + return ZINT_ERROR_MEMORY; /* `z_ct_init_segs()` only fails with OOM */ } for (seg_idx = 0; seg_idx < seg_count; seg_idx++) { const struct zint_seg *const seg = segs + seg_idx; const int length = seg->length > 0 ? seg->length : (int) z_ustrlen(seg->source); - if (rt_init_seg_source(symbol, seg_idx, length)) { - return ZINT_ERROR_MEMORY; /* `rt_init_seg_source()` only fails with OOM */ + if (ct_init_seg_source(symbol, seg_idx, length)) { + return ZINT_ERROR_MEMORY; /* `ct_init_seg_source()` only fails with OOM */ } - memcpy(symbol->raw_segs[seg_idx].source, seg->source, (size_t) length); - symbol->raw_segs[seg_idx].length = length; - symbol->raw_segs[seg_idx].eci = seg->eci ? seg->eci : 3; + memcpy(symbol->content_segs[seg_idx].source, seg->source, (size_t) length); + symbol->content_segs[seg_idx].length = length; + symbol->content_segs[seg_idx].eci = seg->eci ? seg->eci : 3; } return 0; } -/* Update the ECI of raw seg `seg_idx` to `eci`, to reflect (feedback) the actual ECI used */ -INTERNAL void z_rt_set_seg_eci(struct zint_symbol *symbol, const int seg_idx, const int eci) { - assert(symbol->raw_segs); - assert(seg_idx >= 0 && seg_idx < symbol->raw_seg_count); - symbol->raw_segs[seg_idx].eci = eci; +/* Update the ECI of content seg `seg_idx` to `eci`, to reflect (feedback) the actual ECI used */ +INTERNAL void z_ct_set_seg_eci(struct zint_symbol *symbol, const int seg_idx, const int eci) { + assert(symbol->content_segs); + assert(seg_idx >= 0 && seg_idx < symbol->content_seg_count); + symbol->content_segs[seg_idx].eci = eci; } -/* Copy `source` to raw seg 0 buffer, setting raw seg ECI to 3. On error sets `errtxt`, returning +/* Copy `source` to content seg 0 buffer, setting content seg ECI to 3. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_cpy(struct zint_symbol *symbol, const unsigned char source[], const int length) { - assert(!symbol->raw_segs); /* Trap unintended double setting */ - if (z_rt_init_segs(symbol, 1 /*seg_count*/) || rt_init_seg_source(symbol, 0 /*seg_idx*/, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_init_segs()` & `rt_init_seg_source()` only fail with OOM */ +INTERNAL int z_ct_cpy(struct zint_symbol *symbol, const unsigned char source[], const int length) { + assert(!symbol->content_segs); /* Trap unintended double setting */ + if (z_ct_init_segs(symbol, 1 /*seg_count*/) || ct_init_seg_source(symbol, 0 /*seg_idx*/, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_init_segs()` & `ct_init_seg_source()` only fail with OOM */ } - memcpy(symbol->raw_segs[0].source, source, (size_t) length); - symbol->raw_segs[0].length = length; - symbol->raw_segs[0].eci = 3; + memcpy(symbol->content_segs[0].source, source, (size_t) length); + symbol->content_segs[0].length = length; + symbol->content_segs[0].eci = 3; return 0; } -/* Copy `source` to raw seg 0 buffer, appending `separator` (if ASCII - use `\xFF` for none) and then `cat`, and - setting raw seg ECI to 3. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_cpy_cat(struct zint_symbol *symbol, const unsigned char source[], const int length, +/* Copy `source` to content seg 0 buffer, appending `separator` (if ASCII - use `\xFF` for none) and then `cat`, and + setting content seg ECI to 3. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ +INTERNAL int z_ct_cpy_cat(struct zint_symbol *symbol, const unsigned char source[], const int length, const char separator, const unsigned char cat[], const int cat_length) { unsigned char *s; const int total_length = (length > 0 ? length : 0) + z_isascii(separator) + (cat_length > 0 ? cat_length : 0); - assert(!symbol->raw_segs); /* Trap unintended double setting */ - if (z_rt_init_segs(symbol, 1 /*seg_count*/) || rt_init_seg_source(symbol, 0 /*seg_idx*/, total_length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_init_segs()` & `rt_init_seg_source()` only fail with OOM */ + assert(!symbol->content_segs); /* Trap unintended double setting */ + if (z_ct_init_segs(symbol, 1 /*seg_count*/) || ct_init_seg_source(symbol, 0 /*seg_idx*/, total_length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_init_segs()` & `ct_init_seg_source()` only fail with OOM */ } - s = symbol->raw_segs[0].source; + s = symbol->content_segs[0].source; if (length > 0) { memcpy(s, source, (size_t) length); s += length; @@ -1024,27 +1024,27 @@ INTERNAL int z_rt_cpy_cat(struct zint_symbol *symbol, const unsigned char source if (cat_length > 0) { memcpy(s, cat, (size_t) cat_length); } - symbol->raw_segs[0].length = total_length; - symbol->raw_segs[0].eci = 3; + symbol->content_segs[0].length = total_length; + symbol->content_segs[0].eci = 3; return 0; } -/* Convert ISO/IEC 8859-1 (binary) `source` to UTF-8, and copy to raw seg 0 buffer, setting raw seg ECI to 3. +/* Convert ISO/IEC 8859-1 (binary) `source` to UTF-8, and copy to content seg 0 buffer, setting content seg ECI to 3. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_cpy_iso8859_1(struct zint_symbol *symbol, const unsigned char source[], const int length) { +INTERNAL int z_ct_cpy_iso8859_1(struct zint_symbol *symbol, const unsigned char source[], const int length) { int i; int iso_cnt = 0; unsigned char *s; - assert(!symbol->raw_segs); /* Trap unintended double setting */ + assert(!symbol->content_segs); /* Trap unintended double setting */ for (i = 0; i < length; i++) { iso_cnt += !z_isascii(source[i]); } - if (z_rt_init_segs(symbol, 1 /*seg_count*/) || rt_init_seg_source(symbol, 0 /*seg_idx*/, length + iso_cnt)) { - return ZINT_ERROR_MEMORY; /* `z_rt_init_segs()` & `rt_init_seg_source()` only fail with OOM */ + if (z_ct_init_segs(symbol, 1 /*seg_count*/) || ct_init_seg_source(symbol, 0 /*seg_idx*/, length + iso_cnt)) { + return ZINT_ERROR_MEMORY; /* `z_ct_init_segs()` & `ct_init_seg_source()` only fail with OOM */ } - s = symbol->raw_segs[0].source; + s = symbol->content_segs[0].source; for (i = 0; i < length; i++) { if (z_isascii(source[i])) { @@ -1057,34 +1057,34 @@ INTERNAL int z_rt_cpy_iso8859_1(struct zint_symbol *symbol, const unsigned char *s++ = source[i] - 0x40; } } - assert((int) (s - symbol->raw_segs[0].source) == length + iso_cnt); + assert((int) (s - symbol->content_segs[0].source) == length + iso_cnt); - symbol->raw_segs[0].length = length + iso_cnt; - symbol->raw_segs[0].eci = 3; + symbol->content_segs[0].length = length + iso_cnt; + symbol->content_segs[0].eci = 3; return 0; } -/* `sprintf()` into raw seg 0 buffer, assuming formatted data less than 256 bytes. Sets raw seg ECI to 3. On error - sets `errtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_printf_256(struct zint_symbol *symbol, const char *fmt, ...) { +/* `sprintf()` into content seg 0 buffer, assuming formatted data less than 256 bytes. Sets content seg ECI to 3. + On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ +INTERNAL int z_ct_printf_256(struct zint_symbol *symbol, const char *fmt, ...) { va_list ap; int size; - assert(!symbol->raw_segs); /* Trap unintended double setting */ - if (z_rt_init_segs(symbol, 1 /*seg_count*/) || rt_init_seg_source(symbol, 0 /*seg_idx*/, 256)) { - return ZINT_ERROR_MEMORY; /* `z_rt_init_segs()` & `rt_init_seg_source()` only fail with OOM */ + assert(!symbol->content_segs); /* Trap unintended double setting */ + if (z_ct_init_segs(symbol, 1 /*seg_count*/) || ct_init_seg_source(symbol, 0 /*seg_idx*/, 256)) { + return ZINT_ERROR_MEMORY; /* `z_ct_init_segs()` & `ct_init_seg_source()` only fail with OOM */ } va_start(ap, fmt); - size = vsprintf((char *) symbol->raw_segs[0].source, fmt, ap); + size = vsprintf((char *) symbol->content_segs[0].source, fmt, ap); assert(size >= 0); assert(size < 256); - symbol->raw_segs[0].length = size; - symbol->raw_segs[0].eci = 3; + symbol->content_segs[0].length = size; + symbol->content_segs[0].eci = 3; va_end(ap); diff --git a/backend/common.h b/backend/common.h index 7e900aa5..127c8b82 100644 --- a/backend/common.h +++ b/backend/common.h @@ -336,35 +336,35 @@ INTERNAL void z_hrt_conv_gs1_brackets_nochk(struct zint_symbol *symbol, const un const int length); -/* Initialize `raw_segs` for `seg_count` segments. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_init_segs(struct zint_symbol *symbol, const int seg_count); +/* 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); -/* Free `raw_segs` along with any `source` buffers */ -INTERNAL void z_rt_free_segs(struct zint_symbol *symbol); +/* Free `content_segs` along with any `source` buffers */ +INTERNAL void z_ct_free_segs(struct zint_symbol *symbol); -/* Copy `segs` to raw segs. Seg source copied as-is. If seg length <= 0, raw reg length set to `strlen()`. - If seg eci not set, raw seg eci set to 3. On error sets `errxtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_cpy_segs(struct zint_symbol *symbol, const struct zint_seg segs[], const int seg_count); +/* Copy `segs` to content segs. Seg source copied as-is. If seg length <= 0, content reg length set to `strlen()`. + If seg eci not set, content seg eci set to 3. On error sets `errxtxt`, returning BARCODE_ERROR_MEMORY */ +INTERNAL int z_ct_cpy_segs(struct zint_symbol *symbol, const struct zint_seg segs[], const int seg_count); -/* Update the ECI of raw seg `seg_idx` to `eci`, to reflect (feedback) the actual ECI used */ -INTERNAL void z_rt_set_seg_eci(struct zint_symbol *symbol, const int seg_idx, const int eci); +/* Update the ECI of content seg `seg_idx` to `eci`, to reflect (feedback) the actual ECI used */ +INTERNAL void z_ct_set_seg_eci(struct zint_symbol *symbol, const int seg_idx, const int eci); -/* Copy `source` to raw seg 0 buffer, setting raw seg ECI to 3. On error sets `errtxt`, returning +/* Copy `source` to content seg 0 buffer, setting content seg ECI to 3. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_cpy(struct zint_symbol *symbol, const unsigned char source[], const int length); +INTERNAL int z_ct_cpy(struct zint_symbol *symbol, const unsigned char source[], const int length); -/* Copy `source` to raw seg 0 buffer, appending `separator` (if ASCII - use `\xFF` for none) and then `cat`, and - setting raw seg ECI to 3. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_cpy_cat(struct zint_symbol *symbol, const unsigned char source[], const int length, +/* Copy `source` to content seg 0 buffer, appending `separator` (if ASCII - use `\xFF` for none) and then `cat`, and + setting content seg ECI to 3. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ +INTERNAL int z_ct_cpy_cat(struct zint_symbol *symbol, const unsigned char source[], const int length, const char separator, const unsigned char cat[], const int cat_length); -/* Convert ISO/IEC 8859-1 (binary) `source` to UTF-8, and copy to raw seg 0 buffer, setting raw seg ECI to 3. +/* Convert ISO/IEC 8859-1 (binary) `source` to UTF-8, and copy to content seg 0 buffer, setting content seg ECI to 3. On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_cpy_iso8859_1(struct zint_symbol *symbol, const unsigned char source[], const int length); +INTERNAL int z_ct_cpy_iso8859_1(struct zint_symbol *symbol, const unsigned char source[], const int length); -/* `sprintf()` into raw seg 0 buffer, assuming formatted data less than 256 bytes. Sets raw seg ECI to 3. On error - sets `errtxt`, returning BARCODE_ERROR_MEMORY */ -INTERNAL int z_rt_printf_256(struct zint_symbol *symbol, const char *fmt, ...) ZINT_FORMAT_PRINTF(2, 3); +/* `sprintf()` into content seg 0 buffer, assuming formatted data less than 256 bytes. Sets content seg ECI to 3. + On error sets `errtxt`, returning BARCODE_ERROR_MEMORY */ +INTERNAL int z_ct_printf_256(struct zint_symbol *symbol, const char *fmt, ...) ZINT_FORMAT_PRINTF(2, 3); /* Sets symbol height, returning a warning if not within minimum and/or maximum if given. diff --git a/backend/composite.c b/backend/composite.c index c082b60f..202b2f79 100644 --- a/backend/composite.c +++ b/backend/composite.c @@ -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 */ } } diff --git a/backend/dmatrix.c b/backend/dmatrix.c index 0c88b0ef..99cecbbf 100644 --- a/backend/dmatrix.c +++ b/backend/dmatrix.c @@ -1695,7 +1695,7 @@ static int dm_encode_segs(struct zint_symbol *symbol, struct zint_seg segs[], co const int gs1 = (symbol->input_mode & 0x07) == GS1_MODE ? 1 + !!(symbol->output_options & GS1_GS_SEPARATOR) : 0; /* 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); const int debug_print = symbol->debug & ZINT_DEBUG_PRINT; if ((i = z_segs_length(segs, seg_count)) > 3116) { /* Max is 3166 digits */ @@ -1813,8 +1813,8 @@ static int dm_encode_segs(struct zint_symbol *symbol, struct zint_seg segs[], co assert(error_number >= ZINT_ERROR); return error_number; } - 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); } } diff --git a/backend/dotcode.c b/backend/dotcode.c index d9dfbb7b..ccf9cc1e 100644 --- a/backend/dotcode.c +++ b/backend/dotcode.c @@ -996,7 +996,8 @@ static void dc_encode_message_segs(struct zint_symbol *symbol, const struct zint int bin_buf_size = 0; /* 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 = (symbol->input_mode & 0x07) != GS1_MODE && (symbol->output_options & BARCODE_RAW_TEXT); + const int content_segs = (symbol->input_mode & 0x07) != GS1_MODE + && (symbol->output_options & BARCODE_CONTENT_SEGS); const struct zint_seg *last_seg = &segs[seg_count - 1]; @@ -1009,8 +1010,8 @@ static void dc_encode_message_segs(struct zint_symbol *symbol, const struct zint ap = dc_encode_message(symbol, segs[i].source, segs[i].length, segs[i].eci, i == seg_count - 1 /*last_seg*/, last_EOT, last_RSEOT, ap, codeword_array, &encoding_mode, &inside_macro, &bin_buf, &bin_buf_size, structapp_array, p_structapp_size); - 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); } } diff --git a/backend/dxfilmedge.c b/backend/dxfilmedge.c index b43bfd9a..1b4de78e 100644 --- a/backend/dxfilmedge.c +++ b/backend/dxfilmedge.c @@ -62,7 +62,7 @@ static int dx_parse_code(struct zint_symbol *symbol, const unsigned char *source char dx_info[DX_MAX_DX_INFO_LENGTH + 1] = {0}; char frame_info[DX_MAX_FRAME_INFO_LENGTH + 1] = {0}; int dx_length; - 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; *has_frame_info = 0; @@ -247,9 +247,9 @@ static int dx_parse_code(struct zint_symbol *symbol, const unsigned char *source *output_length = bp; - if (raw_text && z_rt_printf_256(symbol, (*has_frame_info ? "%d-%d%s%s" : "%d-%d"), dx_code_1, dx_code_2, "/", + if (content_segs && z_ct_printf_256(symbol, (*has_frame_info ? "%d-%d%s%s" : "%d-%d"), dx_code_1, dx_code_2, "/", frame_info)) { - return ZINT_ERROR_MEMORY; /* `z_rt_printf_256()` only fails with OOM */ + return ZINT_ERROR_MEMORY; /* `z_ct_printf_256()` only fails with OOM */ } return 0; diff --git a/backend/eci.c b/backend/eci.c index f9a071a2..800435c4 100644 --- a/backend/eci.c +++ b/backend/eci.c @@ -1027,13 +1027,13 @@ INTERNAL void zint_gb2312_cpy_segs(struct zint_symbol *symbol, struct zint_seg s unsigned int *ddata, const int full_multibyte) { int i; unsigned int *dd = ddata; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; for (i = 0; i < seg_count; i++) { gb2312_cpy(segs[i].source, &segs[i].length, dd, full_multibyte); - if (raw_text) { - /* Need to set as `z_rt_cpy_segs()` defaults to 3 */ - z_rt_set_seg_eci(symbol, i, segs[i].eci ? segs[i].eci : 29); + if (content_segs) { + /* Need to set as `z_ct_cpy_segs()` defaults to 3 */ + z_ct_set_seg_eci(symbol, i, segs[i].eci ? segs[i].eci : 29); } dd += segs[i].length; } diff --git a/backend/gridmtx.c b/backend/gridmtx.c index 1836de30..b6a97947 100644 --- a/backend/gridmtx.c +++ b/backend/gridmtx.c @@ -989,7 +989,7 @@ INTERNAL int zint_gridmatrix(struct zint_symbol *symbol, struct zint_seg segs[], int size_squared; int bin_len; /* Raw text dealt with by `ZBarcode_Encode_Segs()`, except for `eci` feedback */ - 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; const int eci_length_segs = zint_get_eci_length_segs(segs, seg_count); struct zint_seg *local_segs = (struct zint_seg *) z_alloca(sizeof(struct zint_seg) * seg_count); @@ -1026,8 +1026,8 @@ INTERNAL int zint_gridmatrix(struct zint_symbol *symbol, struct zint_seg segs[], } eci = 29; } - if (raw_text && eci) { - z_rt_set_seg_eci(symbol, i, eci); + if (content_segs && eci) { + z_ct_set_seg_eci(symbol, i, eci); } dd += local_segs[i].length; } diff --git a/backend/hanxin.c b/backend/hanxin.c index a8c3dbba..14134cc3 100644 --- a/backend/hanxin.c +++ b/backend/hanxin.c @@ -1489,7 +1489,7 @@ INTERNAL int zint_hanxin(struct zint_symbol *symbol, struct zint_seg segs[], con int codewords; int bin_len; /* Raw text dealt with by `ZBarcode_Encode_Segs()`, except for `eci` feedback */ - 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; const int eci_length_segs = zint_get_eci_length_segs(segs, seg_count); struct zint_seg *local_segs = (struct zint_seg *) z_alloca(sizeof(struct zint_seg) * seg_count); @@ -1539,8 +1539,8 @@ INTERNAL int zint_hanxin(struct zint_symbol *symbol, struct zint_seg segs[], con } eci = 32; } - if (raw_text && eci) { - z_rt_set_seg_eci(symbol, i, eci); + if (content_segs && eci) { + z_ct_set_seg_eci(symbol, i, eci); } dd += local_segs[i].length; } diff --git a/backend/imail.c b/backend/imail.c index a2eac9b7..4b933073 100644 --- a/backend/imail.c +++ b/backend/imail.c @@ -261,7 +261,7 @@ INTERNAL int zint_usps_imail(struct zint_symbol *symbol, unsigned char source[], unsigned short characters[10]; short bar_map[130]; int zip_len; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 32) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 450, "Input length %d too long (maximum 32)", length); @@ -449,8 +449,8 @@ INTERNAL int zint_usps_imail(struct zint_symbol *symbol, unsigned char source[], symbol->rows = 3; symbol->width = read - 1; - if (raw_text && z_rt_cpy(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; diff --git a/backend/library.c b/backend/library.c index 52320d29..1e6aed76 100644 --- a/backend/library.c +++ b/backend/library.c @@ -77,10 +77,10 @@ static void set_symbol_defaults(struct zint_symbol *symbol) { symbol->alphamap = NULL; symbol->vector = NULL; symbol->memfile = NULL; - symbol->raw_segs = NULL; + symbol->content_segs = NULL; } -/* Create and initialize a symbol structure */ +/* Create a symbol structure and set fields to default values */ struct zint_symbol *ZBarcode_Create(void) { struct zint_symbol *symbol; @@ -94,7 +94,7 @@ struct zint_symbol *ZBarcode_Create(void) { INTERNAL void zint_vector_free(struct zint_symbol *symbol); /* Free vector structures */ -/* Free any output buffers that may have been created and initialize output fields */ +/* Free any output buffers that may have been created and zeroize output fields */ void ZBarcode_Clear(struct zint_symbol *symbol) { int i; @@ -128,7 +128,7 @@ void ZBarcode_Clear(struct zint_symbol *symbol) { } symbol->memfile_size = 0; - z_rt_free_segs(symbol); + z_ct_free_segs(symbol); zint_vector_free(symbol); } @@ -143,7 +143,7 @@ void ZBarcode_Reset(struct zint_symbol *symbol) { if (symbol->memfile != NULL) free(symbol->memfile); - z_rt_free_segs(symbol); + z_ct_free_segs(symbol); zint_vector_free(symbol); memset(symbol, 0, sizeof(*symbol)); @@ -161,7 +161,7 @@ void ZBarcode_Delete(struct zint_symbol *symbol) { if (symbol->memfile != NULL) free(symbol->memfile); - z_rt_free_segs(symbol); + z_ct_free_segs(symbol); zint_vector_free(symbol); free(symbol); @@ -427,7 +427,7 @@ static int hibc(struct zint_symbol *symbol, struct zint_seg segs[], const int se char to_process[110 + 2 + 1]; int posns[110]; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; /* Without "+" and check: max 110 characters in HIBC 2.6 */ if (length > 110) { @@ -457,12 +457,12 @@ static int hibc(struct zint_symbol *symbol, struct zint_seg segs[], const int se if (symbol->debug & ZINT_DEBUG_PRINT) printf("HIBC processed source: %s\n", to_process); - /* Code 128, Code 39 & Codablock-F set `raw_text` themselves, but the others don't, so do it now */ - assert(!symbol->raw_segs); /* HIBC symbologies don't satisfy `supports_non_iso8859_1()` */ - if (raw_text && symbol->symbology != BARCODE_HIBC_128 && symbol->symbology != BARCODE_HIBC_39 + /* Code 128, Code 39 & Codablock-F set `content_segs` themselves, but the others don't, so do it now */ + assert(!symbol->content_segs); /* HIBC symbologies don't satisfy `supports_non_iso8859_1()` */ + if (content_segs && symbol->symbology != BARCODE_HIBC_128 && symbol->symbology != BARCODE_HIBC_39 && symbol->symbology != BARCODE_HIBC_BLOCKF) { - if (z_rt_cpy_segs(symbol, segs, seg_count)) { - return error_tag(ZINT_ERROR_MEMORY, symbol, -1, NULL); /* `z_rt_cpy_segs()` only fails with OOM */ + if (z_ct_cpy_segs(symbol, segs, seg_count)) { + return error_tag(ZINT_ERROR_MEMORY, symbol, -1, NULL); /* `z_ct_cpy_segs()` only fails with OOM */ } } @@ -958,7 +958,7 @@ int ZBarcode_Encode_Segs(struct zint_symbol *symbol, const struct zint_seg segs[ int error_number, warn_number = 0; int total_len = 0; int have_zero_eci = 0; - int escape_mode, raw_text; + int escape_mode, content_segs; int i; unsigned char *local_source; struct zint_seg *local_segs; @@ -992,7 +992,7 @@ int ZBarcode_Encode_Segs(struct zint_symbol *symbol, const struct zint_seg segs[ escape_mode = (symbol->input_mode & ESCAPE_MODE) || ((symbol->input_mode & EXTRA_ESCAPE_MODE) && symbol->symbology == BARCODE_CODE128); - raw_text = symbol->output_options & BARCODE_RAW_TEXT; + content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; local_segs = (struct zint_seg *) z_alloca(sizeof(struct zint_seg) * (seg_count > 0 ? seg_count : 1)); @@ -1135,9 +1135,9 @@ int ZBarcode_Encode_Segs(struct zint_symbol *symbol, const struct zint_seg segs[ if (symbol->rows < 0) { /* Silently defend against out-of-bounds access */ symbol->rows = 0; } - if (raw_text && symbol->rows) { /* Would only give info on last stacked */ + if (content_segs && symbol->rows) { /* Would only give info on last stacked */ return error_tag(ZINT_ERROR_INVALID_OPTION, symbol, 857, - "Cannot use BARCODE_RAW_TEXT output option if stacking symbols"); + "Cannot use BARCODE_CONTENT_SEGS output option if stacking symbols"); } if ((symbol->input_mode & 0x07) == GS1_MODE && !gs1_compliant(symbol->symbology)) { @@ -1226,18 +1226,18 @@ int ZBarcode_Encode_Segs(struct zint_symbol *symbol, const struct zint_seg segs[ warn_number = error_number; /* Override any previous warning (errtxt has been overwritten) */ } memcpy(local_segs[0].source, reduced, local_segs[0].length + 1); /* Include terminating NUL */ - /* Set raw text for non-composites (composites set their own raw text) */ - if (!is_composite && raw_text && z_rt_cpy(symbol, reduced, local_segs[0].length)) { - return error_tag(ZINT_ERROR_MEMORY, symbol, -1, NULL); /* `z_rt_cpy()` only fails with OOM */ + /* Set content segs for non-composites (composites set their own content segs) */ + if (!is_composite && content_segs && z_ct_cpy(symbol, reduced, local_segs[0].length)) { + return error_tag(ZINT_ERROR_MEMORY, symbol, -1, NULL); /* `z_ct_cpy()` only fails with OOM */ } } } else { return error_tag(ZINT_ERROR_INVALID_OPTION, symbol, 210, "Selected symbology does not support GS1 mode"); } - } else if (raw_text && supports_non_iso8859_1(symbol->symbology)) { - /* Copy these as-is. The raw seg `eci` will need to be updated individually */ - if (z_rt_cpy_segs(symbol, local_segs, seg_count)) { - return error_tag(ZINT_ERROR_MEMORY, symbol, -1, NULL); /* `z_rt_cpy_segs()` only fails with OOM */ + } else if (content_segs && supports_non_iso8859_1(symbol->symbology)) { + /* Copy these as-is. The content seg `eci` will need to be updated individually */ + if (z_ct_cpy_segs(symbol, local_segs, seg_count)) { + return error_tag(ZINT_ERROR_MEMORY, symbol, -1, NULL); /* `z_ct_cpy_segs()` only fails with OOM */ } } @@ -1268,10 +1268,10 @@ int ZBarcode_Encode_Segs(struct zint_symbol *symbol, const struct zint_seg segs[ if (symbol->height < 0.5f) { /* Absolute minimum */ (void) z_set_height(symbol, 0.0f, 50.0f, 0.0f, 1 /*no_errtxt*/); } - assert(!(symbol->output_options & BARCODE_RAW_TEXT) - || (symbol->raw_segs && symbol->raw_seg_count && symbol->raw_segs[0].source + assert(!(symbol->output_options & BARCODE_CONTENT_SEGS) + || (symbol->content_segs && symbol->content_seg_count && symbol->content_segs[0].source && ((symbol->input_mode & 0x07) == DATA_MODE - || z_is_valid_utf8(symbol->raw_segs[0].source, symbol->raw_segs[0].length)))); + || z_is_valid_utf8(symbol->content_segs[0].source, symbol->content_segs[0].length)))); } return error_number; diff --git a/backend/mailmark.c b/backend/mailmark.c index fc9b2370..9dfd95ed 100644 --- a/backend/mailmark.c +++ b/backend/mailmark.c @@ -192,7 +192,7 @@ INTERNAL int zint_mailmark_4s(struct zint_symbol *symbol, unsigned char source[] int i, j, len; rs_t rs; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 26) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 580, "Input length %d too long (maximum 26)", length); @@ -501,8 +501,8 @@ INTERNAL int zint_mailmark_4s(struct zint_symbol *symbol, unsigned char source[] symbol->rows = 3; symbol->width = j - 1; - if (raw_text && z_rt_cpy(symbol, local_source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, local_source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; @@ -518,7 +518,7 @@ INTERNAL int zint_mailmark_2d(struct zint_symbol *symbol, unsigned char source[] char postcode[10]; int i; struct zint_seg segs[1]; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 90) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 589, "Input length %d too long (maximum 90)", length); @@ -661,13 +661,13 @@ INTERNAL int zint_mailmark_2d(struct zint_symbol *symbol, unsigned char source[] segs[0].source = local_source; segs[0].length = length; - if (raw_text) { + if (content_segs) { if ((symbol->input_mode & 0x07) == DATA_MODE) { - if (z_rt_cpy(symbol, local_source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (z_ct_cpy(symbol, local_source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } - } else if (z_rt_cpy_iso8859_1(symbol, local_source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_iso8859_1()` only fails with OOM */ + } else if (z_ct_cpy_iso8859_1(symbol, local_source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_iso8859_1()` only fails with OOM */ } } diff --git a/backend/maxicode.c b/backend/maxicode.c index 494946a1..49cf8472 100644 --- a/backend/maxicode.c +++ b/backend/maxicode.c @@ -556,7 +556,7 @@ INTERNAL int zint_maxicode(struct zint_symbol *symbol, struct zint_seg segs[], c int scm_vv = -1; int structapp_cw = 0; /* Raw text dealt with by `ZBarcode_Encode_Segs()`, except for `eci` feedback */ - 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; mode = symbol->option_1; @@ -695,10 +695,10 @@ INTERNAL int zint_maxicode(struct zint_symbol *symbol, struct zint_seg segs[], c return z_errtxt(error_number, symbol, 553, "Input too long, requires too many codewords (maximum 144)"); } - if (raw_text) { + if (content_segs) { for (i = 0; i < seg_count; i++) { if (segs[i].eci) { - z_rt_set_seg_eci(symbol, i, segs[i].eci); + z_ct_set_seg_eci(symbol, i, segs[i].eci); } } } diff --git a/backend/medical.c b/backend/medical.c index 4149f277..589255e7 100644 --- a/backend/medical.c +++ b/backend/medical.c @@ -58,7 +58,7 @@ INTERNAL int zint_pharma(struct zint_symbol *symbol, unsigned char source[], int char *in = inter; char dest[64]; /* 17 * 2 + 1 */ char *d = dest; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 6) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 350, "Input length %d too long (maximum 6)", length); @@ -99,8 +99,8 @@ INTERNAL int zint_pharma(struct zint_symbol *symbol, unsigned char source[], int (void) z_set_height(symbol, 0.0f, 50.0f, 0.0f, 1 /*no_errtxt*/); } - if (raw_text && z_rt_cpy(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; @@ -151,7 +151,7 @@ INTERNAL int zint_pharma_two(struct zint_symbol *symbol, unsigned char source[], unsigned int loopey, h; int writer; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 8) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 354, "Input length %d too long (maximum 8)", length); @@ -190,8 +190,8 @@ INTERNAL int zint_pharma_two(struct zint_symbol *symbol, unsigned char source[], (void) z_set_height(symbol, 0.0f, 10.0f, 0.0f, 1 /*no_errtxt*/); } - if (raw_text && z_rt_cpy(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; @@ -286,7 +286,7 @@ INTERNAL int zint_code32(struct zint_symbol *symbol, unsigned char source[], int z_hrt_cpy_chr(symbol, 'A'); z_hrt_cat_nochk(symbol, local_source, 9); - /* Use `raw_text` set by `zint_code39()` */ + /* Use `content_segs` set by `zint_code39()` */ return error_number; } @@ -373,7 +373,7 @@ INTERNAL int zint_pzn(struct zint_symbol *symbol, unsigned char source[], int le z_hrt_cpy_nochk(symbol, (const unsigned char *) "PZN - ", 6); /* Note changed to put space after hyphen */ z_hrt_cat_nochk(symbol, local_source + 1, 9 - pzn7 - 1); - /* Use `raw_text` set by `zint_code39()` */ + /* Use `content_segs` set by `zint_code39()` */ return error_number; } diff --git a/backend/pdf417.c b/backend/pdf417.c index 06666d7a..f928fd60 100644 --- a/backend/pdf417.c +++ b/backend/pdf417.c @@ -1135,7 +1135,7 @@ static int pdf_initial_segs(struct zint_symbol *symbol, struct zint_seg segs[], int curtable; int tex_padded; /* Raw text dealt with by `ZBarcode_Encode_Segs()`, except for `eci` feedback */ - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; *p_mclength = 0; @@ -1203,8 +1203,8 @@ static int pdf_initial_segs(struct zint_symbol *symbol, struct zint_seg segs[], assert(error_number >= ZINT_ERROR); return error_number; } - 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); } } diff --git a/backend/plessey.c b/backend/plessey.c index 7fb51d3b..2d532155 100644 --- a/backend/plessey.c +++ b/backend/plessey.c @@ -63,7 +63,7 @@ INTERNAL int zint_plessey(struct zint_symbol *symbol, unsigned char source[], in unsigned int check_digits = 0; char c1, c2; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 67) { /* 16 + 67 * 16 + 4 * 8 + 19 = 1139 */ return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 370, "Input length %d too long (maximum 67)", length); @@ -129,8 +129,8 @@ INTERNAL int zint_plessey(struct zint_symbol *symbol, unsigned char source[], in z_hrt_cat_chr_nochk(symbol, c2); } - if (raw_text && z_rt_printf_256(symbol, "%.*s%c%c", length, source, c1, c2)) { - return ZINT_ERROR_MEMORY; /* `z_rt_printf_256()` only fails with OOM */ + if (content_segs && z_ct_printf_256(symbol, "%.*s%c%c", length, source, c1, c2)) { + return ZINT_ERROR_MEMORY; /* `z_ct_printf_256()` only fails with OOM */ } return error_number; @@ -173,7 +173,7 @@ static char msi_check_digit_mod11(const unsigned char source[], const int length /* Plain MSI Plessey - does not calculate any check character */ static char *msi_plessey_nomod(struct zint_symbol *symbol, const unsigned char source[], const int length, - const int raw_text, char *d) { + const int content_segs, char *d) { int i; @@ -183,8 +183,8 @@ static char *msi_plessey_nomod(struct zint_symbol *symbol, const unsigned char s z_hrt_cpy_nochk(symbol, source, length); - if (raw_text && z_rt_cpy(symbol, source, length)) { - return NULL; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, source, length)) { + return NULL; /* `z_ct_cpy()` only fails with OOM */ } return d; @@ -192,7 +192,7 @@ static char *msi_plessey_nomod(struct zint_symbol *symbol, const unsigned char s /* MSI Plessey with Modulo 10 check digit */ static char *msi_plessey_mod10(struct zint_symbol *symbol, const unsigned char source[], const int length, - const int no_checktext, const int raw_text, char *d) { + const int no_checktext, const int content_segs, char *d) { int i; char check_digit; @@ -213,8 +213,8 @@ static char *msi_plessey_mod10(struct zint_symbol *symbol, const unsigned char s z_hrt_cat_chr_nochk(symbol, check_digit); } - if (raw_text && z_rt_cpy_cat(symbol, source, length, check_digit, NULL /*cat*/, 0)) { - return NULL; /* `z_rt_cpy_cat()` only fails with OOM */ + if (content_segs && z_ct_cpy_cat(symbol, source, length, check_digit, NULL /*cat*/, 0)) { + return NULL; /* `z_ct_cpy_cat()` only fails with OOM */ } return d; @@ -222,7 +222,7 @@ static char *msi_plessey_mod10(struct zint_symbol *symbol, const unsigned char s /* MSI Plessey with two Modulo 10 check digits */ static char *msi_plessey_mod1010(struct zint_symbol *symbol, const unsigned char source[], const int length, - const int no_checktext, const int raw_text, char *d) { + const int no_checktext, const int content_segs, char *d) { int i; unsigned char local_source[92 + 2]; @@ -242,15 +242,15 @@ static char *msi_plessey_mod1010(struct zint_symbol *symbol, const unsigned char z_hrt_cpy_nochk(symbol, local_source, length + 2); } - if (raw_text && z_rt_cpy(symbol, local_source, length + 2)) { - return NULL; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, local_source, length + 2)) { + return NULL; /* `z_ct_cpy()` only fails with OOM */ } return d; } /* MSI Plessey with Modulo 11 check digit */ static char *msi_plessey_mod11(struct zint_symbol *symbol, const unsigned char source[], const int length, - const int no_checktext, const int wrap, const int raw_text, char *d) { + const int no_checktext, const int wrap, const int content_segs, char *d) { /* Uses the IBM weight system if wrap = 7, and the NCR system if wrap = 9 */ int i; unsigned char check_digits[2]; @@ -277,7 +277,7 @@ static char *msi_plessey_mod11(struct zint_symbol *symbol, const unsigned char s z_hrt_cat_nochk(symbol, check_digits, check_digits_len); } - if (raw_text && z_rt_cpy_cat(symbol, source, length, '\xFF' /*separator (none)*/, check_digits, + if (content_segs && z_ct_cpy_cat(symbol, source, length, '\xFF' /*separator (none)*/, check_digits, check_digits_len)) { return NULL; /* `check_digits_len()` only fails with OOM */ } @@ -286,7 +286,7 @@ static char *msi_plessey_mod11(struct zint_symbol *symbol, const unsigned char s /* MSI Plessey with Modulo 11 check digit and Modulo 10 check digit */ static char *msi_plessey_mod1110(struct zint_symbol *symbol, const unsigned char source[], const int length, - const int no_checktext, const int wrap, const int raw_text, char *d) { + const int no_checktext, const int wrap, const int content_segs, char *d) { /* Uses the IBM weight system if wrap = 7, and the NCR system if wrap = 9 */ int i; char check_digit; @@ -319,8 +319,8 @@ static char *msi_plessey_mod1110(struct zint_symbol *symbol, const unsigned char z_hrt_cpy_nochk(symbol, local_source, local_length); } - if (raw_text && z_rt_cpy(symbol, local_source, local_length)) { - return NULL; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, local_source, local_length)) { + return NULL; /* `z_ct_cpy()` only fails with OOM */ } return d; @@ -333,7 +333,7 @@ INTERNAL int zint_msi_plessey(struct zint_symbol *symbol, unsigned char source[] char *d = dest; int check_option = symbol->option_2; int no_checktext = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; assert(length > 0); /* Suppress clang-tidy-21 clang-analyzer-security.ArrayBound */ @@ -358,17 +358,17 @@ INTERNAL int zint_msi_plessey(struct zint_symbol *symbol, unsigned char source[] d += 2; switch (check_option) { - case 0: d = msi_plessey_nomod(symbol, source, length, raw_text, d); break; - case 1: d = msi_plessey_mod10(symbol, source, length, no_checktext, raw_text, d); break; - case 2: d = msi_plessey_mod1010(symbol, source, length, no_checktext, raw_text, d); break; - case 3: d = msi_plessey_mod11(symbol, source, length, no_checktext, 7 /*IBM wrap*/, raw_text, d); break; - case 4: d = msi_plessey_mod1110(symbol, source, length, no_checktext, 7 /*IBM wrap*/, raw_text, d); break; - case 5: d = msi_plessey_mod11(symbol, source, length, no_checktext, 9 /*NCR wrap*/, raw_text, d); break; - case 6: d = msi_plessey_mod1110(symbol, source, length, no_checktext, 9 /*NCR wrap*/, raw_text, d); break; + case 0: d = msi_plessey_nomod(symbol, source, length, content_segs, d); break; + case 1: d = msi_plessey_mod10(symbol, source, length, no_checktext, content_segs, d); break; + case 2: d = msi_plessey_mod1010(symbol, source, length, no_checktext, content_segs, d); break; + case 3: d = msi_plessey_mod11(symbol, source, length, no_checktext, 7 /*IBM wrap*/, content_segs, d); break; + case 4: d = msi_plessey_mod1110(symbol, source, length, no_checktext, 7 /*IBM wrap*/, content_segs, d); break; + case 5: d = msi_plessey_mod11(symbol, source, length, no_checktext, 9 /*NCR wrap*/, content_segs, d); break; + case 6: d = msi_plessey_mod1110(symbol, source, length, no_checktext, 9 /*NCR wrap*/, content_segs, d); break; } if (!d) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` etc. only fail with OOM */ + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` etc. only fail with OOM */ } /* Stop character */ diff --git a/backend/postal.c b/backend/postal.c index 2f58b514..9d4bdc82 100644 --- a/backend/postal.c +++ b/backend/postal.c @@ -141,7 +141,7 @@ static int usps_set_height(struct zint_symbol *symbol, const int no_errtxt) { static int postnet_enc(struct zint_symbol *symbol, const unsigned char source[], char *d, const int length) { int i, sum, check_digit; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 38) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 480, "Input length %d too long (maximum 38)", length); @@ -182,8 +182,8 @@ static int postnet_enc(struct zint_symbol *symbol, const unsigned char source[], /* Stop character */ memcpy(d, "L", 2); /* Include terminating NUL */ - if (raw_text && z_rt_cpy_cat(symbol, source, length, (char) z_itoc(check_digit), NULL /*cat*/, 0)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (content_segs && z_ct_cpy_cat(symbol, source, length, (char) z_itoc(check_digit), NULL /*cat*/, 0)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; @@ -222,7 +222,7 @@ INTERNAL int zint_postnet(struct zint_symbol *symbol, unsigned char source[], in static int planet_enc(struct zint_symbol *symbol, const unsigned char source[], char *d, const int length) { int i, sum, check_digit; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 38) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 482, "Input length %d too long (maximum 38)", length); @@ -255,8 +255,8 @@ static int planet_enc(struct zint_symbol *symbol, const unsigned char source[], /* Stop character */ memcpy(d, "L", 2); /* Include terminating NUL */ - if (raw_text && z_rt_cpy_cat(symbol, source, length, (char) z_itoc(check_digit), NULL /*cat*/, 0)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (content_segs && z_ct_cpy_cat(symbol, source, length, (char) z_itoc(check_digit), NULL /*cat*/, 0)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; @@ -298,7 +298,7 @@ INTERNAL int zint_koreapost(struct zint_symbol *symbol, unsigned char source[], char dest[80]; char *d = dest; int posns[6]; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 6) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 484, "Input length %d too long (maximum 6)", length); @@ -336,8 +336,8 @@ INTERNAL int zint_koreapost(struct zint_symbol *symbol, unsigned char source[], z_hrt_cpy_nochk(symbol, local_source, 7); - if (raw_text && z_rt_cpy(symbol, local_source, 7)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, local_source, 7)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; @@ -347,7 +347,7 @@ INTERNAL int zint_koreapost(struct zint_symbol *symbol, unsigned char source[], glyphs from http://en.wikipedia.org/wiki/Facing_Identification_Mark */ INTERNAL int zint_fim(struct zint_symbol *symbol, unsigned char source[], int length) { int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 1) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 486, "Input length %d too long (maximum 1)", length); @@ -388,8 +388,8 @@ INTERNAL int zint_fim(struct zint_symbol *symbol, unsigned char source[], int le (void) z_set_height(symbol, 0.0f, 50.0f, 0.0f, 1 /*no_errtxt*/); } - if (raw_text && z_rt_cpy(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; @@ -476,7 +476,7 @@ INTERNAL int zint_rm4scc(struct zint_symbol *symbol, unsigned char source[], int int writer; char check_digit; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 50) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 488, "Input length %d too long (maximum 50)", length); @@ -523,8 +523,8 @@ INTERNAL int zint_rm4scc(struct zint_symbol *symbol, unsigned char source[], int symbol->rows = 3; symbol->width = writer - 1; - if (raw_text && z_rt_cpy_cat(symbol, source, length, check_digit, NULL /*cat*/, 0)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (content_segs && z_ct_cpy_cat(symbol, source, length, check_digit, NULL /*cat*/, 0)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; @@ -540,7 +540,7 @@ INTERNAL int zint_kix(struct zint_symbol *symbol, unsigned char source[], int le int loopey; int writer, i, h; int error_number = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 18) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 490, "Input length %d too long (maximum 18)", length); @@ -585,8 +585,8 @@ INTERNAL int zint_kix(struct zint_symbol *symbol, unsigned char source[], int le symbol->rows = 3; symbol->width = writer - 1; - if (raw_text && z_rt_cpy(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; @@ -598,7 +598,7 @@ INTERNAL int zint_daft(struct zint_symbol *symbol, unsigned char source[], int l int posns[576]; int loopey; int writer; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 576) { /* 576 * 2 = 1152 */ return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 492, "Input length %d too long (maximum 576)", length); @@ -640,8 +640,8 @@ INTERNAL int zint_daft(struct zint_symbol *symbol, unsigned char source[], int l symbol->rows = 3; symbol->width = writer - 1; - if (raw_text && z_rt_cpy(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return 0; @@ -652,7 +652,7 @@ INTERNAL int zint_flat(struct zint_symbol *symbol, unsigned char source[], int l int i, error_number = 0; char dest[512]; /* 128 * 4 = 512 */ char *d = dest; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 128) { /* 128 * 9 = 1152 */ return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 494, "Input length %d too long (maximum 128)", length); @@ -672,8 +672,8 @@ INTERNAL int zint_flat(struct zint_symbol *symbol, unsigned char source[], int l /* TODO: Find documentation on BARCODE_FLAT dimensions/height */ - if (raw_text && z_rt_cpy(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; @@ -687,7 +687,7 @@ INTERNAL int zint_japanpost(struct zint_symbol *symbol, unsigned char source[], int writer, loopey, inter_posn, i, sum, check; char check_char; unsigned char inter[20 + 1]; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 20) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 496, "Input length %d too long (maximum 20)", length); @@ -792,8 +792,8 @@ INTERNAL int zint_japanpost(struct zint_symbol *symbol, unsigned char source[], } /* Note: check char is in KASUTSET and not truly representable in raw text's SHKASUTSET_F */ - if (raw_text && z_rt_cpy(symbol, source, length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, source, length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } return error_number; diff --git a/backend/qr.c b/backend/qr.c index 80a51de0..e328e6c2 100644 --- a/backend/qr.c +++ b/backend/qr.c @@ -1581,7 +1581,7 @@ static int qr_prep_data(struct zint_symbol *symbol, struct zint_seg segs[], cons /* If ZINT_FULL_MULTIBYTE use Kanji mode in DATA_MODE or for non-Shift JIS in UNICODE_MODE */ const int full_multibyte = (symbol->option_3 & 0xFF) == ZINT_FULL_MULTIBYTE; /* Raw text dealt with by `ZBarcode_Encode_Segs()`, except for `eci` feedback */ - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if ((symbol->input_mode & 0x07) == DATA_MODE) { zint_sjis_cpy_segs(segs, seg_count, ddata, full_multibyte); @@ -1612,8 +1612,8 @@ static int qr_prep_data(struct zint_symbol *symbol, struct zint_seg segs[], cons } eci = 20; } - if (raw_text && eci) { - z_rt_set_seg_eci(symbol, i, eci); + if (content_segs && eci) { + z_ct_set_seg_eci(symbol, i, eci); } dd += segs[i].length; } @@ -2159,7 +2159,7 @@ INTERNAL int zint_microqr(struct zint_symbol *symbol, unsigned char source[], in struct zint_seg segs[1]; const int seg_count = 1; /* Raw text dealt with by `ZBarcode_Encode_Segs()`, except for `eci` feedback */ - 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 > 35) { @@ -2243,8 +2243,8 @@ INTERNAL int zint_microqr(struct zint_symbol *symbol, unsigned char source[], in segs[0].length = length; segs[0].eci = 0; /* MicroQR doesn't support ECI */ - if (raw_text && eci) { /* For feedback set character set used (20 if non-zero) */ - z_rt_set_seg_eci(symbol, 0 /*seg_idx*/, eci); + if (content_segs && eci) { /* For feedback set character set used (20 if non-zero) */ + z_ct_set_seg_eci(symbol, 0 /*seg_idx*/, eci); } /* Determine length of binary data */ @@ -2379,7 +2379,7 @@ INTERNAL int zint_upnqr(struct zint_symbol *symbol, unsigned char source[], int const int seg_count = 1; const int fast_encode = symbol->input_mode & FAST_MODE; /* Raw text dealt with by `ZBarcode_Encode_Segs()`, except for `eci` feedback */ - 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; unsigned char *datastream; unsigned char *fullstream; @@ -2421,8 +2421,8 @@ INTERNAL int zint_upnqr(struct zint_symbol *symbol, unsigned char source[], int segs[0].length = length; segs[0].eci = 4; - if (raw_text) { - z_rt_set_seg_eci(symbol, 0 /*seg_idx*/, segs[0].eci); + if (content_segs) { + z_ct_set_seg_eci(symbol, 0 /*seg_idx*/, segs[0].eci); } est_binlen = qr_calc_binlen_segs(15, modes, ddata, segs, seg_count, NULL /*p_structapp*/, 1 /*mode_preset*/, diff --git a/backend/rss.c b/backend/rss.c index fac6f1f8..94fde662 100644 --- a/backend/rss.c +++ b/backend/rss.c @@ -340,7 +340,7 @@ INTERNAL int zint_dbar_omn_cc(struct zint_symbol *symbol, unsigned char source[] int data_character[4]; int data_widths[4][8], checksum, c_left, c_right, total_widths[46], writer; int separator_row = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; /* Allow and ignore any AI prefix */ if ((length == 17 || length == 18) && (memcmp(source, "[01]", 4) == 0 || memcmp(source, "(01)", 4) == 0)) { @@ -578,10 +578,10 @@ INTERNAL int zint_dbar_omn_cc(struct zint_symbol *symbol, unsigned char source[] } } - if (raw_text) { + if (content_segs) { unsigned char buf[14]; - if (z_rt_cpy_cat(symbol, ZCUCP("01"), 2, '\xFF' /*none*/, dbar_gtin14(source, length, buf), 14)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (z_ct_cpy_cat(symbol, ZCUCP("01"), 2, '\xFF' /*none*/, dbar_gtin14(source, length, buf), 14)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } } @@ -619,7 +619,7 @@ INTERNAL int zint_dbar_ltd_cc(struct zint_symbol *symbol, unsigned char source[] int checksum, total_widths[47], writer; const char *checksum_finder_pattern; int separator_row = 0; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; /* Allow and ignore any AI prefix */ if ((length == 17 || length == 18) && (memcmp(source, "[01]", 4) == 0 || memcmp(source, "(01)", 4) == 0)) { @@ -721,10 +721,10 @@ INTERNAL int zint_dbar_ltd_cc(struct zint_symbol *symbol, unsigned char source[] /* Set human readable text */ dbar_set_gtin14_hrt(symbol, source, length); - if (raw_text) { + if (content_segs) { unsigned char buf[14]; - if (z_rt_cpy_cat(symbol, ZCUCP("01"), 2, '\xFF' /*none*/, dbar_gtin14(source, length, buf), 14)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (z_ct_cpy_cat(symbol, ZCUCP("01"), 2, '\xFF' /*none*/, dbar_gtin14(source, length, buf), 14)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } } @@ -1225,7 +1225,7 @@ INTERNAL int zint_dbar_exp_cc(struct zint_symbol *symbol, unsigned char source[] int reduced_length; /* Allow for 8 bits + 5-bit latch per char + 200 bits overhead/padding */ char *binary_string = (char *) z_alloca(13 * length + 200 + 1); - 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; error_number = zint_gs1_verify(symbol, source, length, reduced, &reduced_length); @@ -1382,8 +1382,8 @@ INTERNAL int zint_dbar_exp_cc(struct zint_symbol *symbol, unsigned char source[] dbar_exp_hrt(symbol, source, length); - if (raw_text && z_rt_cpy(symbol, reduced, reduced_length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, reduced, reduced_length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } } else { @@ -1491,8 +1491,8 @@ INTERNAL int zint_dbar_exp_cc(struct zint_symbol *symbol, unsigned char source[] } symbol->rows -= 3; - if (raw_text && z_rt_cpy(symbol, reduced, reduced_length)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (content_segs && z_ct_cpy(symbol, reduced, reduced_length)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } } diff --git a/backend/telepen.c b/backend/telepen.c index 7d9a0ad5..e5559d59 100644 --- a/backend/telepen.c +++ b/backend/telepen.c @@ -91,7 +91,7 @@ INTERNAL int zint_telepen(struct zint_symbol *symbol, unsigned char source[], in int error_number; char dest[1145]; /* 12 (Start) + 69 * 16 (max for DELs) + 16 (Check) + 12 (stop) + 1 = 1145 */ char *d = dest; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; error_number = 0; @@ -140,8 +140,8 @@ INTERNAL int zint_telepen(struct zint_symbol *symbol, unsigned char source[], in z_hrt_cpy_iso8859_1(symbol, source, length); - if (raw_text && z_rt_cpy_cat(symbol, source, length, (char) check_digit, NULL /*cat*/, 0)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (content_segs && z_ct_cpy_cat(symbol, source, length, (char) check_digit, NULL /*cat*/, 0)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; @@ -154,7 +154,7 @@ INTERNAL int zint_telepen_num(struct zint_symbol *symbol, unsigned char source[] char dest[1129]; /* 12 (Start) + 68 * 16 (max for DELs) + 16 (Check) + 12 (Stop) + 1 = 1129 */ char *d = dest; unsigned char local_source[137]; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; count = 0; @@ -220,8 +220,8 @@ INTERNAL int zint_telepen_num(struct zint_symbol *symbol, unsigned char source[] z_hrt_cpy_nochk(symbol, local_source, length); - if (raw_text && z_rt_cpy_cat(symbol, local_source, length, (char) check_digit, NULL /*cat*/, 0)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (content_segs && z_ct_cpy_cat(symbol, local_source, length, (char) check_digit, NULL /*cat*/, 0)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } return error_number; diff --git a/backend/tests/test_2of5.c b/backend/tests/test_2of5.c index 5b3d03cd..6fb216dd 100644 --- a/backend/tests/test_2of5.c +++ b/backend/tests/test_2of5.c @@ -126,63 +126,63 @@ static void test_hrt(const testCtx *const p_ctx) { int output_options; const char *data; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_C25STANDARD, -1, -1, "123456789", "123456789", "" }, - /* 1*/ { BARCODE_C25STANDARD, -1, BARCODE_RAW_TEXT, "123456789", "123456789", "123456789" }, + /* 1*/ { BARCODE_C25STANDARD, -1, BARCODE_CONTENT_SEGS, "123456789", "123456789", "123456789" }, /* 2*/ { BARCODE_C25STANDARD, 1, -1, "123456789", "1234567895", "" }, - /* 3*/ { BARCODE_C25STANDARD, 1, BARCODE_RAW_TEXT, "123456789", "1234567895", "1234567895" }, + /* 3*/ { BARCODE_C25STANDARD, 1, BARCODE_CONTENT_SEGS, "123456789", "1234567895", "1234567895" }, /* 4*/ { BARCODE_C25STANDARD, 2, -1, "123456789", "123456789", "" }, /* Suppresses printing of check digit */ - /* 5*/ { BARCODE_C25STANDARD, 2, BARCODE_RAW_TEXT, "123456789", "123456789", "1234567895" }, /* Not in raw text */ + /* 5*/ { BARCODE_C25STANDARD, 2, BARCODE_CONTENT_SEGS, "123456789", "123456789", "1234567895" }, /* Not in content text */ /* 6*/ { BARCODE_C25INTER, -1, -1, "123456789", "0123456789", "" }, /* Adds leading zero if odd */ - /* 7*/ { BARCODE_C25INTER, -1, BARCODE_RAW_TEXT, "123456789", "0123456789", "0123456789" }, + /* 7*/ { BARCODE_C25INTER, -1, BARCODE_CONTENT_SEGS, "123456789", "0123456789", "0123456789" }, /* 8*/ { BARCODE_C25INTER, 1, -1, "123456789", "1234567895", "" }, /* Unless check digit added when it becomes even */ - /* 9*/ { BARCODE_C25INTER, 1, BARCODE_RAW_TEXT, "123456789", "1234567895", "1234567895" }, + /* 9*/ { BARCODE_C25INTER, 1, BARCODE_CONTENT_SEGS, "123456789", "1234567895", "1234567895" }, /* 10*/ { BARCODE_C25INTER, 2, -1, "123456789", "123456789", "" }, - /* 11*/ { BARCODE_C25INTER, 2, BARCODE_RAW_TEXT, "123456789", "123456789", "1234567895" }, + /* 11*/ { BARCODE_C25INTER, 2, BARCODE_CONTENT_SEGS, "123456789", "123456789", "1234567895" }, /* 12*/ { BARCODE_C25INTER, -1, -1, "1234567890", "1234567890", "" }, /* No leading zero if even */ - /* 13*/ { BARCODE_C25INTER, -1, BARCODE_RAW_TEXT, "1234567890", "1234567890", "1234567890" }, + /* 13*/ { BARCODE_C25INTER, -1, BARCODE_CONTENT_SEGS, "1234567890", "1234567890", "1234567890" }, /* 14*/ { BARCODE_C25INTER, 1, -1, "1234567890", "012345678905", "" }, /* Unless check digit added when it becomes odd */ - /* 15*/ { BARCODE_C25INTER, 1, BARCODE_RAW_TEXT, "1234567890", "012345678905", "012345678905" }, + /* 15*/ { BARCODE_C25INTER, 1, BARCODE_CONTENT_SEGS, "1234567890", "012345678905", "012345678905" }, /* 16*/ { BARCODE_C25INTER, 2, -1, "1234567890", "01234567890", "" }, - /* 17*/ { BARCODE_C25INTER, 2, BARCODE_RAW_TEXT, "1234567890", "01234567890", "012345678905" }, + /* 17*/ { BARCODE_C25INTER, 2, BARCODE_CONTENT_SEGS, "1234567890", "01234567890", "012345678905" }, /* 18*/ { BARCODE_C25IATA, -1, -1, "123456789", "123456789", "" }, - /* 19*/ { BARCODE_C25IATA, -1, BARCODE_RAW_TEXT, "123456789", "123456789", "123456789" }, + /* 19*/ { BARCODE_C25IATA, -1, BARCODE_CONTENT_SEGS, "123456789", "123456789", "123456789" }, /* 20*/ { BARCODE_C25IATA, 1, -1, "123456789", "1234567895", "" }, - /* 21*/ { BARCODE_C25IATA, 1, BARCODE_RAW_TEXT, "123456789", "1234567895", "1234567895" }, + /* 21*/ { BARCODE_C25IATA, 1, BARCODE_CONTENT_SEGS, "123456789", "1234567895", "1234567895" }, /* 22*/ { BARCODE_C25IATA, 2, -1, "123456789", "123456789", "" }, - /* 23*/ { BARCODE_C25IATA, 2, BARCODE_RAW_TEXT, "123456789", "123456789", "1234567895" }, + /* 23*/ { BARCODE_C25IATA, 2, BARCODE_CONTENT_SEGS, "123456789", "123456789", "1234567895" }, /* 24*/ { BARCODE_C25LOGIC, -1, -1, "123456789", "123456789", "" }, - /* 25*/ { BARCODE_C25LOGIC, -1, BARCODE_RAW_TEXT, "123456789", "123456789", "123456789" }, + /* 25*/ { BARCODE_C25LOGIC, -1, BARCODE_CONTENT_SEGS, "123456789", "123456789", "123456789" }, /* 26*/ { BARCODE_C25LOGIC, 1, -1, "123456789", "1234567895", "" }, - /* 27*/ { BARCODE_C25LOGIC, 1, BARCODE_RAW_TEXT, "123456789", "1234567895", "1234567895" }, + /* 27*/ { BARCODE_C25LOGIC, 1, BARCODE_CONTENT_SEGS, "123456789", "1234567895", "1234567895" }, /* 28*/ { BARCODE_C25LOGIC, 2, -1, "123456789", "123456789", "" }, - /* 29*/ { BARCODE_C25LOGIC, 2, BARCODE_RAW_TEXT, "123456789", "123456789", "1234567895" }, + /* 29*/ { BARCODE_C25LOGIC, 2, BARCODE_CONTENT_SEGS, "123456789", "123456789", "1234567895" }, /* 30*/ { BARCODE_C25IND, -1, -1, "123456789", "123456789", "" }, - /* 31*/ { BARCODE_C25IND, -1, BARCODE_RAW_TEXT, "123456789", "123456789", "123456789" }, + /* 31*/ { BARCODE_C25IND, -1, BARCODE_CONTENT_SEGS, "123456789", "123456789", "123456789" }, /* 32*/ { BARCODE_C25IND, 1, -1, "123456789", "1234567895", "" }, - /* 33*/ { BARCODE_C25IND, 1, BARCODE_RAW_TEXT, "123456789", "1234567895", "1234567895" }, + /* 33*/ { BARCODE_C25IND, 1, BARCODE_CONTENT_SEGS, "123456789", "1234567895", "1234567895" }, /* 34*/ { BARCODE_C25IND, 2, -1, "123456789", "123456789", "" }, - /* 35*/ { BARCODE_C25IND, 2, BARCODE_RAW_TEXT, "123456789", "123456789", "1234567895" }, + /* 35*/ { BARCODE_C25IND, 2, BARCODE_CONTENT_SEGS, "123456789", "123456789", "1234567895" }, /* 36*/ { BARCODE_DPLEIT, -1, -1, "123456789", "00001.234.567.890", "" }, /* Leading zeroes added to make 13 + appended checksum */ - /* 37*/ { BARCODE_DPLEIT, -1, BARCODE_RAW_TEXT, "123456789", "00001.234.567.890", "00001234567890" }, + /* 37*/ { BARCODE_DPLEIT, -1, BARCODE_CONTENT_SEGS, "123456789", "00001.234.567.890", "00001234567890" }, /* 38*/ { BARCODE_DPLEIT, -1, -1, "1234567890123", "12345.678.901.236", "" }, - /* 39*/ { BARCODE_DPLEIT, -1, BARCODE_RAW_TEXT, "1234567890123", "12345.678.901.236", "12345678901236" }, + /* 39*/ { BARCODE_DPLEIT, -1, BARCODE_CONTENT_SEGS, "1234567890123", "12345.678.901.236", "12345678901236" }, /* 40*/ { BARCODE_DPIDENT, -1, -1, "123456789", "00.12 3.456.789 0", "" }, /* Leading zeroes added to make 11 + appended checksum */ - /* 41*/ { BARCODE_DPIDENT, -1, BARCODE_RAW_TEXT, "123456789", "00.12 3.456.789 0", "001234567890" }, + /* 41*/ { BARCODE_DPIDENT, -1, BARCODE_CONTENT_SEGS, "123456789", "00.12 3.456.789 0", "001234567890" }, /* 42*/ { BARCODE_DPIDENT, -1, -1, "12345678901", "12.34 5.678.901 6", "" }, - /* 43*/ { BARCODE_DPIDENT, -1, BARCODE_RAW_TEXT, "12345678901", "12.34 5.678.901 6", "123456789016" }, + /* 43*/ { BARCODE_DPIDENT, -1, BARCODE_CONTENT_SEGS, "12345678901", "12.34 5.678.901 6", "123456789016" }, /* 44*/ { BARCODE_ITF14, -1, -1, "123456789", "00001234567895", "" }, /* Leading zeroes added to make 13 + appended checksum */ - /* 45*/ { BARCODE_ITF14, -1, BARCODE_RAW_TEXT, "123456789", "00001234567895", "00001234567895" }, + /* 45*/ { BARCODE_ITF14, -1, BARCODE_CONTENT_SEGS, "123456789", "00001234567895", "00001234567895" }, /* 46*/ { BARCODE_ITF14, -1, -1, "1234567890123", "12345678901231", "" }, - /* 47*/ { BARCODE_ITF14, -1, BARCODE_RAW_TEXT, "1234567890123", "12345678901231", "12345678901231" }, + /* 47*/ { BARCODE_ITF14, -1, BARCODE_CONTENT_SEGS, "1234567890123", "12345678901231", "12345678901231" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -197,7 +197,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, data[i].option_2, -1 /*option_3*/, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -206,18 +206,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_auspost.c b/backend/tests/test_auspost.c index e02e9fb6..af63bc85 100644 --- a/backend/tests/test_auspost.c +++ b/backend/tests/test_auspost.c @@ -104,39 +104,39 @@ static void test_hrt(const testCtx *const p_ctx) { const char *data; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_AUSPOST, -1, "12345678", "", "" }, /* None */ - /* 1*/ { BARCODE_AUSPOST, BARCODE_RAW_TEXT, "12345678", "", "1112345678" }, + /* 1*/ { BARCODE_AUSPOST, BARCODE_CONTENT_SEGS, "12345678", "", "1112345678" }, /* 2*/ { BARCODE_AUSPOST, -1, "1234567890123", "", "" }, /* None */ - /* 3*/ { BARCODE_AUSPOST, BARCODE_RAW_TEXT, "1234567890123", "", "591234567890123" }, + /* 3*/ { BARCODE_AUSPOST, BARCODE_CONTENT_SEGS, "1234567890123", "", "591234567890123" }, /* 4*/ { BARCODE_AUSPOST, -1, "1234567890123456", "", "" }, /* None */ - /* 5*/ { BARCODE_AUSPOST, BARCODE_RAW_TEXT, "1234567890123456", "", "591234567890123456" }, + /* 5*/ { BARCODE_AUSPOST, BARCODE_CONTENT_SEGS, "1234567890123456", "", "591234567890123456" }, /* 6*/ { BARCODE_AUSPOST, -1, "123456789012345678", "", "" }, /* None */ - /* 7*/ { BARCODE_AUSPOST, BARCODE_RAW_TEXT, "123456789012345678", "", "62123456789012345678" }, + /* 7*/ { BARCODE_AUSPOST, BARCODE_CONTENT_SEGS, "123456789012345678", "", "62123456789012345678" }, /* 8*/ { BARCODE_AUSPOST, -1, "12345678901234567890123", "", "" }, /* None */ - /* 9*/ { BARCODE_AUSPOST, BARCODE_RAW_TEXT, "12345678901234567890123", "", "6212345678901234567890123" }, + /* 9*/ { BARCODE_AUSPOST, BARCODE_CONTENT_SEGS, "12345678901234567890123", "", "6212345678901234567890123" }, /* 10*/ { BARCODE_AUSREPLY, -1, "1234567", "", "" }, /* None */ - /* 11*/ { BARCODE_AUSREPLY, BARCODE_RAW_TEXT, "1234567", "", "4501234567" }, + /* 11*/ { BARCODE_AUSREPLY, BARCODE_CONTENT_SEGS, "1234567", "", "4501234567" }, /* 12*/ { BARCODE_AUSREPLY, -1, "12345678", "", "" }, /* None */ - /* 13*/ { BARCODE_AUSREPLY, BARCODE_RAW_TEXT, "12345678", "", "4512345678" }, + /* 13*/ { BARCODE_AUSREPLY, BARCODE_CONTENT_SEGS, "12345678", "", "4512345678" }, /* 14*/ { BARCODE_AUSROUTE, -1, "123456", "", "" }, /* None */ - /* 15*/ { BARCODE_AUSROUTE, BARCODE_RAW_TEXT, "123456", "", "8700123456" }, + /* 15*/ { BARCODE_AUSROUTE, BARCODE_CONTENT_SEGS, "123456", "", "8700123456" }, /* 16*/ { BARCODE_AUSROUTE, -1, "12345678", "", "" }, /* None */ - /* 17*/ { BARCODE_AUSROUTE, BARCODE_RAW_TEXT, "12345678", "", "8712345678" }, + /* 17*/ { BARCODE_AUSROUTE, BARCODE_CONTENT_SEGS, "12345678", "", "8712345678" }, /* 18*/ { BARCODE_AUSROUTE, -1, "12345", "", "" }, /* None */ - /* 19*/ { BARCODE_AUSROUTE, BARCODE_RAW_TEXT, "12345", "", "8700012345" }, + /* 19*/ { BARCODE_AUSROUTE, BARCODE_CONTENT_SEGS, "12345", "", "8700012345" }, /* 20*/ { BARCODE_AUSREDIRECT, -1, "12345678", "", "" }, /* None */ - /* 21*/ { BARCODE_AUSREDIRECT, BARCODE_RAW_TEXT, "12345678", "", "9212345678" }, + /* 21*/ { BARCODE_AUSREDIRECT, BARCODE_CONTENT_SEGS, "12345678", "", "9212345678" }, /* 22*/ { BARCODE_AUSREDIRECT, -1, "1234", "", "" }, /* None */ - /* 23*/ { BARCODE_AUSREDIRECT, BARCODE_RAW_TEXT, "1234", "", "9200001234" }, + /* 23*/ { BARCODE_AUSREDIRECT, BARCODE_CONTENT_SEGS, "1234", "", "9200001234" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -151,7 +151,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -160,18 +160,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_aztec.c b/backend/tests/test_aztec.c index 2dcddfab..4e7e1297 100644 --- a/backend/tests/test_aztec.c +++ b/backend/tests/test_aztec.c @@ -3194,27 +3194,27 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_AZTEC, UNICODE_MODE, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { BARCODE_AZTEC, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { BARCODE_AZTEC, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { BARCODE_AZTEC, UNICODE_MODE, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 3*/ { BARCODE_AZTEC, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 3*/ { BARCODE_AZTEC, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 4*/ { BARCODE_AZTEC, DATA_MODE, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 5*/ { BARCODE_AZTEC, DATA_MODE, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 5*/ { BARCODE_AZTEC, DATA_MODE, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 6*/ { BARCODE_AZTEC, UNICODE_MODE, 26, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 7*/ { BARCODE_AZTEC, UNICODE_MODE, 26, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 7*/ { BARCODE_AZTEC, UNICODE_MODE, 26, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 8*/ { BARCODE_AZTEC, UNICODE_MODE, 899, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 9*/ { BARCODE_AZTEC, UNICODE_MODE, 899, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 9*/ { BARCODE_AZTEC, UNICODE_MODE, 899, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, /* 10*/ { BARCODE_AZTEC, GS1_MODE, -1, -1, "[01]04912345123459[15]970331[30]128[10](BC123", -1, 0, 0, "", -1, 0 }, - /* 11*/ { BARCODE_AZTEC, GS1_MODE, -1, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10](BC123", -1, 0, 0, "01049123451234591597033130128\03510(BC123", -1, 3 }, - /* 12*/ { BARCODE_AZTEC, GS1_MODE | ESCAPE_MODE | GS1PARENS_MODE, -1, BARCODE_RAW_TEXT, "(01)04912345123459(15)970331(30)128(10)\\(BC123", -1, 0, 0, "01049123451234591597033130128\03510(BC123", -1, 3 }, - /* 13*/ { BARCODE_AZTEC, GS1_MODE, 26, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10](BC123", -1, 0, 26, "01049123451234591597033130128\03510(BC123", -1, 3 }, /* Note: raw text ECI remains at default 3 */ - /* 14*/ { BARCODE_AZTEC, GS1_MODE, 24, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10](BC123", -1, 0, 24, "01049123451234591597033130128\03510(BC123", -1, 3 }, + /* 11*/ { BARCODE_AZTEC, GS1_MODE, -1, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10](BC123", -1, 0, 0, "01049123451234591597033130128\03510(BC123", -1, 3 }, + /* 12*/ { BARCODE_AZTEC, GS1_MODE | ESCAPE_MODE | GS1PARENS_MODE, -1, BARCODE_CONTENT_SEGS, "(01)04912345123459(15)970331(30)128(10)\\(BC123", -1, 0, 0, "01049123451234591597033130128\03510(BC123", -1, 3 }, + /* 13*/ { BARCODE_AZTEC, GS1_MODE, 26, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10](BC123", -1, 0, 26, "01049123451234591597033130128\03510(BC123", -1, 3 }, /* Note: content seg ECI remains at default 3 */ + /* 14*/ { BARCODE_AZTEC, GS1_MODE, 24, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10](BC123", -1, 0, 24, "01049123451234591597033130128\03510(BC123", -1, 3 }, /* 15*/ { BARCODE_HIBC_AZTEC, UNICODE_MODE, -1, -1, "H123ABC01234567890", -1, 0, 0, "", -1, 0 }, - /* 16*/ { BARCODE_HIBC_AZTEC, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "H123ABC01234567890", -1, 0, 0, "+H123ABC01234567890D", -1, 3 }, + /* 16*/ { BARCODE_HIBC_AZTEC, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "H123ABC01234567890", -1, 0, 0, "+H123ABC01234567890D", -1, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -3246,23 +3246,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -3283,17 +3283,17 @@ static void test_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 15, 15, {{0}}, 0 }, - /* 1*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 15, 15, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 15, 15, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 19, 19, {{0}}, 0 }, - /* 3*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 19, 19, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 3*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 19, 19, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 4*/ { DATA_MODE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 19, 19, {{0}}, 0 }, - /* 5*/ { DATA_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 19, 19, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 5*/ { DATA_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 19, 19, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -3327,31 +3327,31 @@ static void test_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_bc412.c b/backend/tests/test_bc412.c index 02f244c3..649d7e97 100644 --- a/backend/tests/test_bc412.c +++ b/backend/tests/test_bc412.c @@ -43,7 +43,7 @@ static void test_input(const testCtx *const p_ctx) { int expected_rows; int expected_width; const char *expected; - const char *expected_raw; + const char *expected_content; const char *comment; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ @@ -51,40 +51,40 @@ static void test_input(const testCtx *const p_ctx) { /* 0*/ { UNICODE_MODE, -1, "123456", -1, ZINT_ERROR_TOO_LONG, -1, -1, "Error 792: Input length 6 too short (minimum 7)", "", "" }, /* 1*/ { UNICODE_MODE, -1, "1234567890123456789", -1, ZINT_ERROR_TOO_LONG, -1, -1, "Error 790: Input length 19 too long (maximum 18)", "", "" }, /* 2*/ { UNICODE_MODE, -1, "1234567", -1, 0, 1, 102, "1U234567", "", "" }, - /* 3*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "1234567", -1, 0, 1, 102, "1U234567", "1U234567", "No difference" }, + /* 3*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "1234567", -1, 0, 1, 102, "1U234567", "1U234567", "No difference" }, /* 4*/ { UNICODE_MODE, -1, "1234567 ", -1, ZINT_ERROR_INVALID_DATA, -1, -1, "Error 791: Invalid character at position 8 in input (alphanumerics only, excluding \"O\")", "", "" }, /* 5*/ { UNICODE_MODE, -1, "ABCDEFGHIJKLMNOPQR", -1, ZINT_ERROR_INVALID_DATA, -1, -1, "Error 791: Invalid character at position 15 in input (alphanumerics only, excluding \"O\")", "", "" }, /* 6*/ { UNICODE_MODE, -1, "ABCDEFGHIJKLMNPQRS", -1, 0, 1, 234, "AQBCDEFGHIJKLMNPQRS", "", "" }, - /* 7*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "ABCDEFGHIJKLMNPQRS", -1, 0, 1, 234, "AQBCDEFGHIJKLMNPQRS", "AQBCDEFGHIJKLMNPQRS", "No difference" }, + /* 7*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "ABCDEFGHIJKLMNPQRS", -1, 0, 1, 234, "AQBCDEFGHIJKLMNPQRS", "AQBCDEFGHIJKLMNPQRS", "No difference" }, /* 8*/ { UNICODE_MODE, -1, "STUVWXYZ1234567890", -1, 0, 1, 234, "SCTUVWXYZ1234567890", "", "" }, /* 9*/ { UNICODE_MODE, -1, "abcdefghijklmnpqrs", -1, 0, 1, 234, "AQBCDEFGHIJKLMNPQRS", "", "" }, - /* 10*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "abcdefghijklmnpqrs", -1, 0, 1, 234, "AQBCDEFGHIJKLMNPQRS", "AQBCDEFGHIJKLMNPQRS", "No difference" }, + /* 10*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "abcdefghijklmnpqrs", -1, 0, 1, 234, "AQBCDEFGHIJKLMNPQRS", "AQBCDEFGHIJKLMNPQRS", "No difference" }, /* 11*/ { UNICODE_MODE, -1, "123456789012345678", -1, 0, 1, 234, "1223456789012345678", "", "" }, - /* 12*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "123456789012345678", -1, 0, 1, 234, "1223456789012345678", "1223456789012345678", "No difference" }, + /* 12*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "123456789012345678", -1, 0, 1, 234, "1223456789012345678", "1223456789012345678", "No difference" }, /* 13*/ { UNICODE_MODE, -1, "MMMMMMMMMMMMMMMMMM", -1, 0, 1, 234, "MTMMMMMMMMMMMMMMMMM", "", "" }, /* 14*/ { UNICODE_MODE, -1, "00000000", -1, 0, 1, 114, "000000000", "", "" }, - /* 15*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "00000000", -1, 0, 1, 114, "000000000", "000000000", "" }, + /* 15*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "00000000", -1, 0, 1, 114, "000000000", "000000000", "" }, /* 16*/ { UNICODE_MODE, -1, "000000000", -1, 0, 1, 126, "0000000000", "", "" }, - /* 17*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "000000000", -1, 0, 1, 126, "0000000000", "0000000000", "" }, + /* 17*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "000000000", -1, 0, 1, 126, "0000000000", "0000000000", "" }, /* 18*/ { UNICODE_MODE, -1, "000S0S000S", -1, 0, 1, 138, "0S00S0S000S", "", "" }, - /* 19*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "000S0S000S", -1, 0, 1, 138, "0S00S0S000S", "0S00S0S000S", "" }, + /* 19*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "000S0S000S", -1, 0, 1, 138, "0S00S0S000S", "0S00S0S000S", "" }, /* 20*/ { UNICODE_MODE, -1, "ZYXWVUTSRQP", -1, 0, 1, 150, "Z0YXWVUTSRQP", "", "" }, /* 21*/ { UNICODE_MODE, -1, "0R9GLVHA8EZ4", -1, 0, 1, 162, "0DR9GLVHA8EZ4", "", "" }, /* 22*/ { UNICODE_MODE, -1, "NTS1J2Q6C7DYK", -1, 0, 1, 174, "NRTS1J2Q6C7DYK", "", "" }, /* 23*/ { UNICODE_MODE, -1, "TS1J2Q6C7DYKBU", -1, 0, 1, 186, "TWS1J2Q6C7DYKBU", "", "" }, - /* 24*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "TS1J2Q6C7DYKBU", -1, 0, 1, 186, "TWS1J2Q6C7DYKBU", "TWS1J2Q6C7DYKBU", "" }, + /* 24*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "TS1J2Q6C7DYKBU", -1, 0, 1, 186, "TWS1J2Q6C7DYKBU", "TWS1J2Q6C7DYKBU", "" }, /* 25*/ { UNICODE_MODE, -1, "IX3FWP5M0R9GLVH", -1, 0, 1, 198, "IBX3FWP5M0R9GLVH", "", "" }, /* 26*/ { UNICODE_MODE, -1, "R9GLVHA8EZ4NTS1J", -1, 0, 1, 210, "RY9GLVHA8EZ4NTS1J", "", "" }, /* 27*/ { UNICODE_MODE, -1, "M5PWF3XIUBKYD7C6Q", -1, 0, 1, 222, "M35PWF3XIUBKYD7C6Q", "", "" }, /* 28*/ { UNICODE_MODE, -1, "2J1STN4ZE8AHVLG90R", -1, 0, 1, 234, "2PJ1STN4ZE8AHVLG90R", "", "" }, - /* 29*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "2J1STN4ZE8AHVLG90R", -1, 0, 1, 234, "2PJ1STN4ZE8AHVLG90R", "2PJ1STN4ZE8AHVLG90R", "" }, + /* 29*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "2J1STN4ZE8AHVLG90R", -1, 0, 1, 234, "2PJ1STN4ZE8AHVLG90R", "2PJ1STN4ZE8AHVLG90R", "" }, /* 30*/ { UNICODE_MODE, -1, "JJJJJJJJJJJJJJJJJJ", -1, 0, 1, 234, "J9JJJJJJJJJJJJJJJJJ", "", "" }, - /* 31*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "JJJJJJJJJJJJJJJJJJ", -1, 0, 1, 234, "J9JJJJJJJJJJJJJJJJJ", "J9JJJJJJJJJJJJJJJJJ", "" }, + /* 31*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "JJJJJJJJJJJJJJJJJJ", -1, 0, 1, 234, "J9JJJJJJJJJJJJJJJJJ", "J9JJJJJJJJJJJJJJJJJ", "" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; char bwipp_buf[8192]; char bwipp_msg[1024]; @@ -104,10 +104,11 @@ static void test_input(const testCtx *const p_ctx) { -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, data[i].output_options, data[i].data, data[i].length, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); - assert_equal(ret, data[i].ret, "i:%d ZBarcode_Encode ret %d != %d (%s)\n", i, ret, data[i].ret, symbol->errtxt); + assert_equal(ret, data[i].ret, "i:%d ZBarcode_Encode ret %d != %d (%s)\n", + i, ret, data[i].ret, symbol->errtxt); if (ret < ZINT_ERROR) { assert_equal(symbol->rows, data[i].expected_rows, "i:%d symbol->rows %d != %d (%s)\n", @@ -118,32 +119,36 @@ static void test_input(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, + data[i].expected_content, expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } if (do_bwipp && testUtilCanBwipp(i, symbol, -1, -1, -1, debug)) { char modules_dump[8192 + 1]; - assert_notequal(testUtilModulesDump(symbol, modules_dump, sizeof(modules_dump)), -1, "i:%d testUtilModulesDump == -1\n", i); - ret = testUtilBwipp(i, symbol, -1, -1, -1, data[i].data, length, NULL, bwipp_buf, sizeof(bwipp_buf), NULL); - assert_zero(ret, "i:%d %s testUtilBwipp ret %d != 0\n", i, testUtilBarcodeName(symbol->symbology), ret); + assert_notequal(testUtilModulesDump(symbol, modules_dump, sizeof(modules_dump)), -1, + "i:%d testUtilModulesDump == -1\n", i); + ret = testUtilBwipp(i, symbol, -1, -1, -1, data[i].data, length, NULL, bwipp_buf, sizeof(bwipp_buf), + NULL); + assert_zero(ret, "i:%d %s testUtilBwipp ret %d != 0\n", + i, testUtilBarcodeName(symbol->symbology), ret); ret = testUtilBwippCmp(symbol, bwipp_msg, bwipp_buf, modules_dump); assert_zero(ret, "i:%d %s testUtilBwippCmp %d != 0 %s\n actual: %s\nexpected: %s\n", i, testUtilBarcodeName(symbol->symbology), ret, bwipp_msg, bwipp_buf, modules_dump); } } else { - assert_zero(strcmp(symbol->errtxt, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->errtxt, data[i].expected); + assert_zero(strcmp(symbol->errtxt, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", + i, symbol->errtxt, data[i].expected); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_channel.c b/backend/tests/test_channel.c index 3bcff2f3..b50dd2c7 100644 --- a/backend/tests/test_channel.c +++ b/backend/tests/test_channel.c @@ -45,47 +45,47 @@ static void test_hrt(const testCtx *const p_ctx) { /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { -1, -1, "1", -1, "01" }, - /* 1*/ { -1, BARCODE_RAW_TEXT, "1", -1, "01" }, /* No difference */ + /* 1*/ { -1, BARCODE_CONTENT_SEGS, "1", -1, "01" }, /* No difference */ /* 2*/ { 3, -1, "1", -1, "01" }, - /* 3*/ { 3, BARCODE_RAW_TEXT, "1", -1, "01" }, + /* 3*/ { 3, BARCODE_CONTENT_SEGS, "1", -1, "01" }, /* 4*/ { 3, -1, "12", -1, "12" }, - /* 5*/ { 3, BARCODE_RAW_TEXT, "12", -1, "12" }, + /* 5*/ { 3, BARCODE_CONTENT_SEGS, "12", -1, "12" }, /* 6*/ { 4, -1, "123", -1, "123" }, - /* 7*/ { 4, BARCODE_RAW_TEXT, "123", -1, "123" }, + /* 7*/ { 4, BARCODE_CONTENT_SEGS, "123", -1, "123" }, /* 8*/ { 5, -1, "123", -1, "0123" }, - /* 9*/ { 5, BARCODE_RAW_TEXT, "123", -1, "0123" }, + /* 9*/ { 5, BARCODE_CONTENT_SEGS, "123", -1, "0123" }, /* 10*/ { 5, -1, "12", -1, "0012" }, - /* 11*/ { 5, BARCODE_RAW_TEXT, "12", -1, "0012" }, + /* 11*/ { 5, BARCODE_CONTENT_SEGS, "12", -1, "0012" }, /* 12*/ { 5, -1, "1", -1, "0001" }, - /* 13*/ { 5, BARCODE_RAW_TEXT, "1", -1, "0001" }, + /* 13*/ { 5, BARCODE_CONTENT_SEGS, "1", -1, "0001" }, /* 14*/ { 5, -1, "1234", -1, "1234" }, - /* 15*/ { 5, BARCODE_RAW_TEXT, "1234", -1, "1234" }, + /* 15*/ { 5, BARCODE_CONTENT_SEGS, "1234", -1, "1234" }, /* 16*/ { 6, -1, "1234", -1, "01234" }, - /* 17*/ { 6, BARCODE_RAW_TEXT, "1234", -1, "01234" }, + /* 17*/ { 6, BARCODE_CONTENT_SEGS, "1234", -1, "01234" }, /* 18*/ { 6, -1, "123", -1, "00123" }, - /* 19*/ { 6, BARCODE_RAW_TEXT, "123", -1, "00123" }, + /* 19*/ { 6, BARCODE_CONTENT_SEGS, "123", -1, "00123" }, /* 20*/ { 6, -1, "12", -1, "00012" }, - /* 21*/ { 6, BARCODE_RAW_TEXT, "12", -1, "00012" }, + /* 21*/ { 6, BARCODE_CONTENT_SEGS, "12", -1, "00012" }, /* 22*/ { 6, -1, "1", -1, "00001" }, - /* 23*/ { 6, BARCODE_RAW_TEXT, "1", -1, "00001" }, + /* 23*/ { 6, BARCODE_CONTENT_SEGS, "1", -1, "00001" }, /* 24*/ { 7, -1, "1234", -1, "001234" }, - /* 25*/ { 7, BARCODE_RAW_TEXT, "1234", -1, "001234" }, + /* 25*/ { 7, BARCODE_CONTENT_SEGS, "1234", -1, "001234" }, /* 26*/ { 7, -1, "12345", -1, "012345" }, - /* 27*/ { 7, BARCODE_RAW_TEXT, "12345", -1, "012345" }, + /* 27*/ { 7, BARCODE_CONTENT_SEGS, "12345", -1, "012345" }, /* 28*/ { 7, -1, "123456", -1, "123456" }, - /* 29*/ { 7, BARCODE_RAW_TEXT, "123456", -1, "123456" }, + /* 29*/ { 7, BARCODE_CONTENT_SEGS, "123456", -1, "123456" }, /* 30*/ { 7, -1, "1", -1, "000001" }, - /* 31*/ { 7, BARCODE_RAW_TEXT, "1", -1, "000001" }, + /* 31*/ { 7, BARCODE_CONTENT_SEGS, "1", -1, "000001" }, /* 32*/ { 8, -1, "12345", -1, "0012345" }, - /* 33*/ { 8, BARCODE_RAW_TEXT, "12345", -1, "0012345" }, + /* 33*/ { 8, BARCODE_CONTENT_SEGS, "12345", -1, "0012345" }, /* 34*/ { 8, -1, "123456", -1, "0123456" }, - /* 35*/ { 8, BARCODE_RAW_TEXT, "123456", -1, "0123456" }, + /* 35*/ { 8, BARCODE_CONTENT_SEGS, "123456", -1, "0123456" }, /* 36*/ { 8, -1, "1234567", -1, "1234567" }, - /* 37*/ { 8, BARCODE_RAW_TEXT, "1234567", -1, "1234567" }, + /* 37*/ { 8, BARCODE_CONTENT_SEGS, "1234567", -1, "1234567" }, /* 38*/ { 8, -1, "12", -1, "0000012" }, - /* 39*/ { 8, BARCODE_RAW_TEXT, "12", -1, "0000012" }, + /* 39*/ { 8, BARCODE_CONTENT_SEGS, "12", -1, "0000012" }, /* 40*/ { 8, -1, "1", -1, "0000001" }, - /* 41*/ { 8, BARCODE_RAW_TEXT, "1", -1, "0000001" }, + /* 41*/ { 8, BARCODE_CONTENT_SEGS, "1", -1, "0000001" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -113,17 +113,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected, expected_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected, + expected_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_codabar.c b/backend/tests/test_codabar.c index a0122d6f..227ce016 100644 --- a/backend/tests/test_codabar.c +++ b/backend/tests/test_codabar.c @@ -96,27 +96,27 @@ static void test_hrt(const testCtx *const p_ctx) { const char *data; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_CODABAR, -1, -1, "A1234B", "A1234B", "" }, - /* 1*/ { BARCODE_CODABAR, -1, BARCODE_RAW_TEXT, "A1234B", "A1234B", "A1234B" }, + /* 1*/ { BARCODE_CODABAR, -1, BARCODE_CONTENT_SEGS, "A1234B", "A1234B", "A1234B" }, /* 2*/ { BARCODE_CODABAR, -1, -1, "a1234c", "A1234C", "" }, /* Converts to upper */ - /* 3*/ { BARCODE_CODABAR, -1, BARCODE_RAW_TEXT, "a1234c", "A1234C", "A1234C" }, + /* 3*/ { BARCODE_CODABAR, -1, BARCODE_CONTENT_SEGS, "a1234c", "A1234C", "A1234C" }, /* 4*/ { BARCODE_CODABAR, 1, -1, "A1234B", "A1234B", "" }, /* Check not included */ - /* 5*/ { BARCODE_CODABAR, 1, BARCODE_RAW_TEXT, "A1234B", "A1234B", "A12345B" }, + /* 5*/ { BARCODE_CODABAR, 1, BARCODE_CONTENT_SEGS, "A1234B", "A1234B", "A12345B" }, /* 6*/ { BARCODE_CODABAR, 2, -1, "A1234B", "A12345B", "" }, /* Check included */ - /* 7*/ { BARCODE_CODABAR, 2, BARCODE_RAW_TEXT, "A1234B", "A12345B", "A12345B" }, + /* 7*/ { BARCODE_CODABAR, 2, BARCODE_CONTENT_SEGS, "A1234B", "A12345B", "A12345B" }, /* 8*/ { BARCODE_CODABAR, 1, -1, "A123456A", "A123456A", "" }, /* Check not included */ - /* 9*/ { BARCODE_CODABAR, 1, BARCODE_RAW_TEXT, "A123456A", "A123456A", "A123456$A" }, + /* 9*/ { BARCODE_CODABAR, 1, BARCODE_CONTENT_SEGS, "A123456A", "A123456A", "A123456$A" }, /* 10*/ { BARCODE_CODABAR, 2, -1, "A123456A", "A123456$A", "" }, /* Check included */ - /* 11*/ { BARCODE_CODABAR, 2, BARCODE_RAW_TEXT, "A123456A", "A123456$A", "A123456$A" }, + /* 11*/ { BARCODE_CODABAR, 2, BARCODE_CONTENT_SEGS, "A123456A", "A123456$A", "A123456$A" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -131,7 +131,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, data[i].option_2, -1 /*option_3*/, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -140,18 +140,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_codablock.c b/backend/tests/test_codablock.c index da80be33..72bc5bb0 100644 --- a/backend/tests/test_codablock.c +++ b/backend/tests/test_codablock.c @@ -295,32 +295,32 @@ static void test_hrt(const testCtx *const p_ctx) { int length; const char *expected; - const char *expected_raw; - int expected_raw_length; + const char *expected_content; + int expected_content_length; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_CODABLOCKF, UNICODE_MODE, -1, -1, -1, "12345623456", -1, "", "", -1 }, /* None */ - /* 1*/ { BARCODE_CODABLOCKF, UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "12345623456", -1, "", "12345623456", -1 }, + /* 1*/ { BARCODE_CODABLOCKF, UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "12345623456", -1, "", "12345623456", -1 }, /* 2*/ { BARCODE_CODABLOCKF, UNICODE_MODE, 1, -1, -1, "12345623456", -1, "", "", -1 }, /* None (CODE128) */ - /* 3*/ { BARCODE_CODABLOCKF, UNICODE_MODE, 1, -1, BARCODE_RAW_TEXT, "12345623456", -1, "", "12345623456", -1 }, + /* 3*/ { BARCODE_CODABLOCKF, UNICODE_MODE, 1, -1, BARCODE_CONTENT_SEGS, "12345623456", -1, "", "12345623456", -1 }, /* 4*/ { BARCODE_CODABLOCKF, UNICODE_MODE, 1, -1, -1, "12345623456\012é", -1, "", "", -1 }, /* None (CODE128) */ - /* 5*/ { BARCODE_CODABLOCKF, UNICODE_MODE, 1, -1, BARCODE_RAW_TEXT, "12345623456\012é", -1, "", "12345623456\012é", -1 }, /* Now UTF-8, not converted */ + /* 5*/ { BARCODE_CODABLOCKF, UNICODE_MODE, 1, -1, BARCODE_CONTENT_SEGS, "12345623456\012é", -1, "", "12345623456\012é", -1 }, /* Now UTF-8, not converted */ /* 6*/ { BARCODE_CODABLOCKF, UNICODE_MODE, -1, -1, -1, "12345623456\012é", -1, "", "", -1 }, /* None */ - /* 7*/ { BARCODE_CODABLOCKF, UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "12345623456\012é", -1, "", "12345623456\012é", -1 }, + /* 7*/ { BARCODE_CODABLOCKF, UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "12345623456\012é", -1, "", "12345623456\012é", -1 }, /* 8*/ { BARCODE_CODABLOCKF, UNICODE_MODE, -1, -1, -1, "12345623456\000\012é", -1, "", "", -1 }, /* None */ - /* 9*/ { BARCODE_CODABLOCKF, UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "12345623456\000\012é", 15, "", "12345623456\000\012é", 15 }, + /* 9*/ { BARCODE_CODABLOCKF, UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "12345623456\000\012é", 15, "", "12345623456\000\012é", 15 }, /* 10*/ { BARCODE_CODABLOCKF, DATA_MODE, -1, -1, -1, "12345623456\000\012é", 15, "", "", -1 }, /* None */ - /* 11*/ { BARCODE_CODABLOCKF, DATA_MODE, -1, -1, BARCODE_RAW_TEXT, "12345623456\000\012é", 15, "", "12345623456\000\012é", 15 }, + /* 11*/ { BARCODE_CODABLOCKF, DATA_MODE, -1, -1, BARCODE_CONTENT_SEGS, "12345623456\000\012é", 15, "", "12345623456\000\012é", 15 }, /* 12*/ { BARCODE_CODABLOCKF, DATA_MODE, -1, -1, -1, "12345623456\000\012\351", 14, "", "", -1 }, /* None */ - /* 13*/ { BARCODE_CODABLOCKF, DATA_MODE, -1, -1, BARCODE_RAW_TEXT, "12345623456\000\012\351", 14, "", "12345623456\000\012\351", 14 }, + /* 13*/ { BARCODE_CODABLOCKF, DATA_MODE, -1, -1, BARCODE_CONTENT_SEGS, "12345623456\000\012\351", 14, "", "12345623456\000\012\351", 14 }, /* 14*/ { BARCODE_HIBC_BLOCKF, UNICODE_MODE, -1, -1, -1, "H123ABC01234567890", -1, "", "", -1 }, /* None */ - /* 15*/ { BARCODE_HIBC_BLOCKF, UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "H123ABC01234567890", -1, "", "+H123ABC01234567890D", -1 }, + /* 15*/ { BARCODE_HIBC_BLOCKF, UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "H123ABC01234567890", -1, "", "+H123ABC01234567890D", -1 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -335,8 +335,8 @@ static void test_hrt(const testCtx *const p_ctx) { data[i].option_1, data[i].option_2, -1 /*option_3*/, data[i].output_options, data[i].data, data[i].length, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = data[i].expected_raw_length == -1 ? (int) strlen(data[i].expected_raw) - : data[i].expected_raw_length; + expected_content_length = data[i].expected_content_length == -1 ? (int) strlen(data[i].expected_content) + : data[i].expected_content_length; ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -345,18 +345,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(memcmp(symbol->text, data[i].expected, expected_length), "i:%d memcmp(%s, %s, %d) != 0\n", i, symbol->text, data[i].expected, expected_length); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %.*s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, expected_raw_length, - data[i].expected_raw, expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, expected_content_length, + data[i].expected_content, expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_code.c b/backend/tests/test_code.c index beeb8036..6db9c210 100644 --- a/backend/tests/test_code.c +++ b/backend/tests/test_code.c @@ -117,80 +117,80 @@ static void test_hrt(const testCtx *const p_ctx) { const char *expected; int expected_length; - const char *expected_raw; - int expected_raw_length; + const char *expected_content; + int expected_content_length; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_CODE39, -1, -1, "ABC1234", -1, "*ABC1234*", -1, "", -1 }, - /* 1*/ { BARCODE_CODE39, -1, BARCODE_RAW_TEXT, "ABC1234", -1, "*ABC1234*", -1, "ABC1234", -1 }, + /* 1*/ { BARCODE_CODE39, -1, BARCODE_CONTENT_SEGS, "ABC1234", -1, "*ABC1234*", -1, "ABC1234", -1 }, /* 2*/ { BARCODE_CODE39, 1, -1, "ABC1234", -1, "*ABC12340*", -1, "", -1 }, /* With visible check digit */ - /* 3*/ { BARCODE_CODE39, 1, BARCODE_RAW_TEXT, "ABC1234", -1, "*ABC12340*", -1, "ABC12340", -1 }, + /* 3*/ { BARCODE_CODE39, 1, BARCODE_CONTENT_SEGS, "ABC1234", -1, "*ABC12340*", -1, "ABC12340", -1 }, /* 4*/ { BARCODE_CODE39, -1, -1, "abc1234", -1, "*ABC1234*", -1, "", -1 }, /* Converts to upper */ - /* 5*/ { BARCODE_CODE39, -1, BARCODE_RAW_TEXT, "abc1234", -1, "*ABC1234*", -1, "ABC1234", -1 }, + /* 5*/ { BARCODE_CODE39, -1, BARCODE_CONTENT_SEGS, "abc1234", -1, "*ABC1234*", -1, "ABC1234", -1 }, /* 6*/ { BARCODE_CODE39, 1, -1, "abc1234", -1, "*ABC12340*", -1, "", -1 }, /* Converts to upper */ - /* 7*/ { BARCODE_CODE39, 1, BARCODE_RAW_TEXT, "abc1234", -1, "*ABC12340*", -1, "ABC12340", -1 }, + /* 7*/ { BARCODE_CODE39, 1, BARCODE_CONTENT_SEGS, "abc1234", -1, "*ABC12340*", -1, "ABC12340", -1 }, /* 8*/ { BARCODE_CODE39, 1, -1, "ab", -1, "*ABL*", -1, "", -1 }, /* Converts to upper */ - /* 9*/ { BARCODE_CODE39, 1, BARCODE_RAW_TEXT, "ab", -1, "*ABL*", -1, "ABL", -1 }, + /* 9*/ { BARCODE_CODE39, 1, BARCODE_CONTENT_SEGS, "ab", -1, "*ABL*", -1, "ABL", -1 }, /* 10*/ { BARCODE_CODE39, -1, -1, "123456789", -1, "*123456789*", -1, "", -1 }, - /* 11*/ { BARCODE_CODE39, -1, BARCODE_RAW_TEXT, "123456789", -1, "*123456789*", -1, "123456789", -1 }, + /* 11*/ { BARCODE_CODE39, -1, BARCODE_CONTENT_SEGS, "123456789", -1, "*123456789*", -1, "123456789", -1 }, /* 12*/ { BARCODE_CODE39, 1, -1, "123456789", -1, "*1234567892*", -1, "", -1 }, /* With visible check digit */ - /* 13*/ { BARCODE_CODE39, 1, BARCODE_RAW_TEXT, "123456789", -1, "*1234567892*", -1, "1234567892", -1 }, + /* 13*/ { BARCODE_CODE39, 1, BARCODE_CONTENT_SEGS, "123456789", -1, "*1234567892*", -1, "1234567892", -1 }, /* 14*/ { BARCODE_CODE39, 2, -1, "123456789", -1, "*123456789*", -1, "", -1 }, /* With hidden check digit */ - /* 15*/ { BARCODE_CODE39, 2, BARCODE_RAW_TEXT, "123456789", -1, "*123456789*", -1, "1234567892", -1 }, /* Includes check digit */ + /* 15*/ { BARCODE_CODE39, 2, BARCODE_CONTENT_SEGS, "123456789", -1, "*123456789*", -1, "1234567892", -1 }, /* Includes check digit */ /* 16*/ { BARCODE_EXCODE39, -1, -1, "ABC1234", -1, "ABC1234", -1, "", -1 }, - /* 17*/ { BARCODE_EXCODE39, -1, BARCODE_RAW_TEXT, "ABC1234", -1, "ABC1234", -1, "ABC1234", -1 }, + /* 17*/ { BARCODE_EXCODE39, -1, BARCODE_CONTENT_SEGS, "ABC1234", -1, "ABC1234", -1, "ABC1234", -1 }, /* 18*/ { BARCODE_EXCODE39, 1, -1, "ABC1234", -1, "ABC12340", -1, "", -1 }, /* With visible check digit */ - /* 19*/ { BARCODE_EXCODE39, 1, BARCODE_RAW_TEXT, "ABC1234", -1, "ABC12340", -1, "ABC12340", -1 }, + /* 19*/ { BARCODE_EXCODE39, 1, BARCODE_CONTENT_SEGS, "ABC1234", -1, "ABC12340", -1, "ABC12340", -1 }, /* 20*/ { BARCODE_EXCODE39, -1, -1, "abc1234", -1, "abc1234", -1, "", -1 }, - /* 21*/ { BARCODE_EXCODE39, -1, BARCODE_RAW_TEXT, "abc1234", -1, "abc1234", -1, "abc1234", -1 }, + /* 21*/ { BARCODE_EXCODE39, -1, BARCODE_CONTENT_SEGS, "abc1234", -1, "abc1234", -1, "abc1234", -1 }, /* 22*/ { BARCODE_EXCODE39, 1, -1, "abc1234", -1, "abc1234.", -1, "", -1 }, /* With visible check digit (previously was hidden) */ - /* 23*/ { BARCODE_EXCODE39, 1, BARCODE_RAW_TEXT, "abc1234", -1, "abc1234.", -1, "abc1234.", -1 }, + /* 23*/ { BARCODE_EXCODE39, 1, BARCODE_CONTENT_SEGS, "abc1234", -1, "abc1234.", -1, "abc1234.", -1 }, /* 24*/ { BARCODE_EXCODE39, 2, -1, "abc1234", -1, "abc1234", -1, "", -1 }, /* With hidden check digit */ - /* 25*/ { BARCODE_EXCODE39, 2, BARCODE_RAW_TEXT, "abc1234", -1, "abc1234", -1, "abc1234.", -1 }, /* Includes check digit */ + /* 25*/ { BARCODE_EXCODE39, 2, BARCODE_CONTENT_SEGS, "abc1234", -1, "abc1234", -1, "abc1234.", -1 }, /* Includes check digit */ /* 26*/ { BARCODE_EXCODE39, -1, -1, "a%\000\001$\177z\033\037!+/\\@A~", 16, "a% $ z !+/\\@A~", -1, "", -1 }, /* NUL, ctrls and DEL replaced with spaces */ - /* 27*/ { BARCODE_EXCODE39, -1, BARCODE_RAW_TEXT, "a%\000\001$\177z\033\037!+/\\@A~", 16, "a% $ z !+/\\@A~", -1, "a%\000\001$\177z\033\037!+/\\@A~", 16 }, /* No replacements */ + /* 27*/ { BARCODE_EXCODE39, -1, BARCODE_CONTENT_SEGS, "a%\000\001$\177z\033\037!+/\\@A~", 16, "a% $ z !+/\\@A~", -1, "a%\000\001$\177z\033\037!+/\\@A~", 16 }, /* No replacements */ /* 28*/ { BARCODE_EXCODE39, 1, -1, "a%\000\001$\177z\033\037!+/\\@A~", 16, "a% $ z !+/\\@A~L", -1, "", -1 }, /* With visible check digit */ - /* 29*/ { BARCODE_EXCODE39, 1, BARCODE_RAW_TEXT, "a%\000\001$\177z\033\037!+/\\@A~", 16, "a% $ z !+/\\@A~L", -1, "a%\000\001$\177z\033\037!+/\\@A~L", 17 }, + /* 29*/ { BARCODE_EXCODE39, 1, BARCODE_CONTENT_SEGS, "a%\000\001$\177z\033\037!+/\\@A~", 16, "a% $ z !+/\\@A~L", -1, "a%\000\001$\177z\033\037!+/\\@A~L", 17 }, /* 30*/ { BARCODE_EXCODE39, 2, -1, "a%\000\001$\177z\033\037!+/\\@A~", 16, "a% $ z !+/\\@A~", -1, "", -1 }, /* With hidden check digit */ - /* 31*/ { BARCODE_EXCODE39, 2, BARCODE_RAW_TEXT, "a%\000\001$\177z\033\037!+/\\@A~", 16, "a% $ z !+/\\@A~", -1, "a%\000\001$\177z\033\037!+/\\@A~L", 17 }, /* Includes check digit */ + /* 31*/ { BARCODE_EXCODE39, 2, BARCODE_CONTENT_SEGS, "a%\000\001$\177z\033\037!+/\\@A~", 16, "a% $ z !+/\\@A~", -1, "a%\000\001$\177z\033\037!+/\\@A~L", 17 }, /* Includes check digit */ /* 32*/ { BARCODE_LOGMARS, -1, -1, "ABC1234", -1, "ABC1234", -1, "", -1 }, - /* 33*/ { BARCODE_LOGMARS, -1, BARCODE_RAW_TEXT, "ABC1234", -1, "ABC1234", -1, "ABC1234", -1 }, + /* 33*/ { BARCODE_LOGMARS, -1, BARCODE_CONTENT_SEGS, "ABC1234", -1, "ABC1234", -1, "ABC1234", -1 }, /* 34*/ { BARCODE_LOGMARS, -1, -1, "abc1234", -1, "ABC1234", -1, "", -1 }, /* Converts to upper */ - /* 35*/ { BARCODE_LOGMARS, -1, BARCODE_RAW_TEXT, "abc1234", -1, "ABC1234", -1, "ABC1234", -1 }, + /* 35*/ { BARCODE_LOGMARS, -1, BARCODE_CONTENT_SEGS, "abc1234", -1, "ABC1234", -1, "ABC1234", -1 }, /* 36*/ { BARCODE_LOGMARS, 1, -1, "abc1234", -1, "ABC12340", -1, "", -1 }, /* With check digit */ - /* 37*/ { BARCODE_LOGMARS, 1, BARCODE_RAW_TEXT, "abc1234", -1, "ABC12340", -1, "ABC12340", -1 }, + /* 37*/ { BARCODE_LOGMARS, 1, BARCODE_CONTENT_SEGS, "abc1234", -1, "ABC12340", -1, "ABC12340", -1 }, /* 38*/ { BARCODE_LOGMARS, 1, -1, "12345/ABCDE", -1, "12345/ABCDET", -1, "", -1 }, /* With visible check digit */ - /* 39*/ { BARCODE_LOGMARS, 1, BARCODE_RAW_TEXT, "12345/ABCDE", -1, "12345/ABCDET", -1, "12345/ABCDET", -1 }, + /* 39*/ { BARCODE_LOGMARS, 1, BARCODE_CONTENT_SEGS, "12345/ABCDE", -1, "12345/ABCDET", -1, "12345/ABCDET", -1 }, /* 40*/ { BARCODE_LOGMARS, 2, -1, "12345/ABCDE", -1, "12345/ABCDE", -1, "", -1 }, /* With hidden check digit */ - /* 41*/ { BARCODE_LOGMARS, 2, BARCODE_RAW_TEXT, "12345/ABCDE", -1, "12345/ABCDE", -1, "12345/ABCDET", -1 }, /* Includes check digit */ + /* 41*/ { BARCODE_LOGMARS, 2, BARCODE_CONTENT_SEGS, "12345/ABCDE", -1, "12345/ABCDE", -1, "12345/ABCDET", -1 }, /* Includes check digit */ /* 42*/ { BARCODE_CODE93, -1, -1, "ABC1234", -1, "ABC1234", -1, "", -1 }, /* No longer shows 2 check chars added (same as BWIPP and TEC-IT) */ - /* 43*/ { BARCODE_CODE93, -1, BARCODE_RAW_TEXT, "ABC1234", -1, "ABC1234", -1, "ABC1234S5", -1 }, /* Unless BARCODE_RAW_TEXT */ + /* 43*/ { BARCODE_CODE93, -1, BARCODE_CONTENT_SEGS, "ABC1234", -1, "ABC1234", -1, "ABC1234S5", -1 }, /* Unless BARCODE_CONTENT_SEGS */ /* 44*/ { BARCODE_CODE93, 1, -1, "ABC1234", -1, "ABC1234S5", -1, "", -1 }, /* Unless requested */ - /* 45*/ { BARCODE_CODE93, 1, BARCODE_RAW_TEXT, "ABC1234", -1, "ABC1234S5", -1, "ABC1234S5", -1 }, + /* 45*/ { BARCODE_CODE93, 1, BARCODE_CONTENT_SEGS, "ABC1234", -1, "ABC1234S5", -1, "ABC1234S5", -1 }, /* 46*/ { BARCODE_CODE93, -1, -1, "abc1234", -1, "abc1234", -1, "", -1 }, - /* 47*/ { BARCODE_CODE93, -1, BARCODE_RAW_TEXT, "abc1234", -1, "abc1234", -1, "abc1234ZG", -1 }, + /* 47*/ { BARCODE_CODE93, -1, BARCODE_CONTENT_SEGS, "abc1234", -1, "abc1234", -1, "abc1234ZG", -1 }, /* 48*/ { BARCODE_CODE93, 1, -1, "abc1234", -1, "abc1234ZG", -1, "", -1 }, - /* 49*/ { BARCODE_CODE93, 1, BARCODE_RAW_TEXT, "abc1234", -1, "abc1234ZG", -1, "abc1234ZG", -1 }, + /* 49*/ { BARCODE_CODE93, 1, BARCODE_CONTENT_SEGS, "abc1234", -1, "abc1234ZG", -1, "abc1234ZG", -1 }, /* 50*/ { BARCODE_CODE93, -1, -1, "A\001a\000b\177d\037e", 9, "A a b d e", -1, "", -1 }, /* NUL, ctrls and DEL replaced with spaces */ - /* 51*/ { BARCODE_CODE93, -1, BARCODE_RAW_TEXT, "A\001a\000b\177d\037e", 9, "A a b d e", -1, "A\001a\000b\177d\037e1R", 11 }, /* No replacements */ + /* 51*/ { BARCODE_CODE93, -1, BARCODE_CONTENT_SEGS, "A\001a\000b\177d\037e", 9, "A a b d e", -1, "A\001a\000b\177d\037e1R", 11 }, /* No replacements */ /* 52*/ { BARCODE_CODE93, 1, -1, "A\001a\000b\177d\037e", 9, "A a b d e1R", -1, "", -1 }, - /* 53*/ { BARCODE_CODE93, 1, BARCODE_RAW_TEXT, "A\001a\000b\177d\037e", 9, "A a b d e1R", -1, "A\001a\000b\177d\037e1R", 11 }, + /* 53*/ { BARCODE_CODE93, 1, BARCODE_CONTENT_SEGS, "A\001a\000b\177d\037e", 9, "A a b d e1R", -1, "A\001a\000b\177d\037e1R", 11 }, /* 54*/ { BARCODE_VIN, -1, -1, "1FTCR10UXTPA78180", -1, "1FTCR10UXTPA78180", -1, "", -1 }, - /* 55*/ { BARCODE_VIN, -1, BARCODE_RAW_TEXT, "1FTCR10UXTPA78180", -1, "1FTCR10UXTPA78180", -1, "1FTCR10UXTPA78180", -1 }, + /* 55*/ { BARCODE_VIN, -1, BARCODE_CONTENT_SEGS, "1FTCR10UXTPA78180", -1, "1FTCR10UXTPA78180", -1, "1FTCR10UXTPA78180", -1 }, /* 56*/ { BARCODE_VIN, 1, -1, "2FTPX28L0XCA15511", -1, "2FTPX28L0XCA15511", -1, "", -1 }, /* Include Import char - no change in HRT */ - /* 57*/ { BARCODE_VIN, 1, BARCODE_RAW_TEXT, "2FTPX28L0XCA15511", -1, "2FTPX28L0XCA15511", -1, "I2FTPX28L0XCA15511", -1 }, /* Included in BARCODE_RAW_TEXT */ + /* 57*/ { BARCODE_VIN, 1, BARCODE_CONTENT_SEGS, "2FTPX28L0XCA15511", -1, "2FTPX28L0XCA15511", -1, "I2FTPX28L0XCA15511", -1 }, /* Included in BARCODE_CONTENT_SEGS */ /* 58*/ { BARCODE_HIBC_39, -1, -1, "ABC1234", -1, "*+ABC1234+*", -1, "", -1 }, - /* 59*/ { BARCODE_HIBC_39, -1, BARCODE_RAW_TEXT, "ABC1234", -1, "*+ABC1234+*", -1, "+ABC1234+", -1 }, + /* 59*/ { BARCODE_HIBC_39, -1, BARCODE_CONTENT_SEGS, "ABC1234", -1, "*+ABC1234+*", -1, "+ABC1234+", -1 }, /* 60*/ { BARCODE_HIBC_39, -1, -1, "abc1234", -1, "*+ABC1234+*", -1, "", -1 }, /* Converts to upper */ - /* 61*/ { BARCODE_HIBC_39, -1, BARCODE_RAW_TEXT, "abc1234", -1, "*+ABC1234+*", -1, "+ABC1234+", -1 }, + /* 61*/ { BARCODE_HIBC_39, -1, BARCODE_CONTENT_SEGS, "abc1234", -1, "*+ABC1234+*", -1, "+ABC1234+", -1 }, /* 62*/ { BARCODE_HIBC_39, -1, -1, "123456789", -1, "*+1234567890*", -1, "", -1 }, - /* 63*/ { BARCODE_HIBC_39, -1, BARCODE_RAW_TEXT, "123456789", -1, "*+1234567890*", -1, "+1234567890", -1 }, + /* 63*/ { BARCODE_HIBC_39, -1, BARCODE_CONTENT_SEGS, "123456789", -1, "*+1234567890*", -1, "+1234567890", -1 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -205,7 +205,8 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, data[i].option_2, -1 /*option_3*/, data[i].output_options, data[i].data, data[i].length, debug); expected_length = data[i].expected_length == -1 ? (int) strlen(data[i].expected) : data[i].expected_length; - expected_raw_length = data[i].expected_raw_length == -1 ? (int) strlen(data[i].expected_raw) : data[i].expected_raw_length; + expected_content_length = data[i].expected_content_length == -1 + ? (int) strlen(data[i].expected_content) : data[i].expected_content_length; ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -214,18 +215,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(memcmp(symbol->text, data[i].expected, expected_length), "i:%d memcmp(%s, %s, %d) != 0\n", i, symbol->text, data[i].expected, expected_length); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %.*s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, expected_raw_length, - data[i].expected_raw, expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, expected_content_length, + data[i].expected_content, expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_code1.c b/backend/tests/test_code1.c index fb1c8e85..57449ed0 100644 --- a/backend/tests/test_code1.c +++ b/backend/tests/test_code1.c @@ -3378,28 +3378,28 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 3*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 3*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 4*/ { DATA_MODE, -1, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 5*/ { DATA_MODE, -1, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 5*/ { DATA_MODE, -1, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 6*/ { UNICODE_MODE, 26, -1, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 7*/ { UNICODE_MODE, 26, -1, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 7*/ { UNICODE_MODE, 26, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 8*/ { UNICODE_MODE, 899, -1, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 9*/ { UNICODE_MODE, 899, -1, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 9*/ { UNICODE_MODE, 899, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, /* 10*/ { GS1_MODE, -1, -1, -1, "[01]04912345123459[15]970331[30]128[10]ABC12(", -1, 0, 0, "", -1, 0 }, - /* 11*/ { GS1_MODE, -1, -1, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC12(", -1, 0, 0, "01049123451234591597033130128\03510ABC12(", -1, 3 }, - /* 12*/ { GS1_MODE, 4, -1, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC12(", -1, ZINT_WARN_INVALID_OPTION, 4, "01049123451234591597033130128\03510ABC12(", -1, 3 }, /* Note raw text ECI remains at default 3 */ - /* 13*/ { GS1_MODE, 4, 10, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC12(", -1, ZINT_WARN_INVALID_OPTION, 4, "01049123451234591597033130128\03510ABC12(", -1, 3 }, /* Version T, ECI ignored */ - /* 14*/ { GS1_MODE | ESCAPE_MODE | GS1PARENS_MODE, -1, -1, BARCODE_RAW_TEXT, "(01)04912345123459(15)970331(30)128(10)ABC12\\(", -1, 0, 0, "01049123451234591597033130128\03510ABC12(", -1, 3 }, + /* 11*/ { GS1_MODE, -1, -1, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC12(", -1, 0, 0, "01049123451234591597033130128\03510ABC12(", -1, 3 }, + /* 12*/ { GS1_MODE, 4, -1, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC12(", -1, ZINT_WARN_INVALID_OPTION, 4, "01049123451234591597033130128\03510ABC12(", -1, 3 }, /* Note content seg ECI remains at default 3 */ + /* 13*/ { GS1_MODE, 4, 10, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC12(", -1, ZINT_WARN_INVALID_OPTION, 4, "01049123451234591597033130128\03510ABC12(", -1, 3 }, /* Version T, ECI ignored */ + /* 14*/ { GS1_MODE | ESCAPE_MODE | GS1PARENS_MODE, -1, -1, BARCODE_CONTENT_SEGS, "(01)04912345123459(15)970331(30)128(10)ABC12\\(", -1, 0, 0, "01049123451234591597033130128\03510ABC12(", -1, 3 }, /* 15*/ { UNICODE_MODE, -1, 9, -1, "12345", -1, 0, 0, "", -1, 0 }, /* Version S */ - /* 16*/ { UNICODE_MODE, -1, 9, BARCODE_RAW_TEXT, "12345", -1, 0, 0, "12345", -1, 3 }, - /* 17*/ { UNICODE_MODE, 4, 9, BARCODE_RAW_TEXT, "12345", -1, ZINT_WARN_INVALID_OPTION, 4, "12345", -1, 4 }, + /* 16*/ { UNICODE_MODE, -1, 9, BARCODE_CONTENT_SEGS, "12345", -1, 0, 0, "12345", -1, 3 }, + /* 17*/ { UNICODE_MODE, 4, 9, BARCODE_CONTENT_SEGS, "12345", -1, ZINT_WARN_INVALID_OPTION, 4, "12345", -1, 4 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -3431,23 +3431,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -3469,21 +3469,21 @@ static void test_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 16, 18, {{0}}, 0 }, - /* 1*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 16, 18, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 16, 18, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 28, 32, {{0}}, 0 }, - /* 3*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 28, 32, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 3*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 28, 32, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 4*/ { DATA_MODE, -1, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 28, 32, {{0}}, 0 }, - /* 5*/ { DATA_MODE, -1, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 28, 32, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 5*/ { DATA_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 28, 32, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, /* 6*/ { UNICODE_MODE, 9, -1, { { TU("12"), -1, 0 }, {0}, {0} }, 0, 8, 11, {{0}}, 0 }, /* Version S */ - /* 7*/ { UNICODE_MODE, 9, BARCODE_RAW_TEXT, { { TU("12"), -1, 0 }, {0}, {0} }, 0, 8, 11, { { TU("12"), 2, 3 }, {0}, {0} }, 1 }, + /* 7*/ { UNICODE_MODE, 9, BARCODE_CONTENT_SEGS, { { TU("12"), -1, 0 }, {0}, {0} }, 0, 8, 11, { { TU("12"), 2, 3 }, {0}, {0} }, 1 }, /* 8*/ { UNICODE_MODE, 9, -1, { { TU("12"), -1, 20 }, {0}, {0} }, ZINT_WARN_INVALID_OPTION, 8, 11, {{0}}, 0 }, /* Version S */ - /* 9*/ { UNICODE_MODE, 9, BARCODE_RAW_TEXT, { { TU("12"), -1, 20 }, {0}, {0} }, ZINT_WARN_INVALID_OPTION, 8, 11, { { TU("12"), 2, 20 }, {0}, {0} }, 1 }, + /* 9*/ { UNICODE_MODE, 9, BARCODE_CONTENT_SEGS, { { TU("12"), -1, 20 }, {0}, {0} }, ZINT_WARN_INVALID_OPTION, 8, 11, { { TU("12"), 2, 20 }, {0}, {0} }, 1 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -3517,31 +3517,31 @@ static void test_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_code11.c b/backend/tests/test_code11.c index 1ba0c474..824e3689 100644 --- a/backend/tests/test_code11.c +++ b/backend/tests/test_code11.c @@ -102,13 +102,13 @@ static void test_hrt(const testCtx *const p_ctx) { /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_CODE11, -1, -1, "123-45", -1, "123-4552" }, /* 2 checksums */ - /* 1*/ { BARCODE_CODE11, -1, BARCODE_RAW_TEXT, "123-45", -1, "123-4552" }, /* No difference */ + /* 1*/ { BARCODE_CODE11, -1, BARCODE_CONTENT_SEGS, "123-45", -1, "123-4552" }, /* No difference */ /* 2*/ { BARCODE_CODE11, 1, -1, "123-45", -1, "123-455" }, /* 1 check digit */ - /* 3*/ { BARCODE_CODE11, 1, BARCODE_RAW_TEXT, "123-45", -1, "123-455" }, /* No difference */ + /* 3*/ { BARCODE_CODE11, 1, BARCODE_CONTENT_SEGS, "123-45", -1, "123-455" }, /* No difference */ /* 4*/ { BARCODE_CODE11, 2, -1, "123-45", -1, "123-45" }, /* No checksums */ - /* 5*/ { BARCODE_CODE11, 2, BARCODE_RAW_TEXT, "123-45", -1, "123-45" }, /* No difference */ + /* 5*/ { BARCODE_CODE11, 2, BARCODE_CONTENT_SEGS, "123-45", -1, "123-45" }, /* No difference */ /* 6*/ { BARCODE_CODE11, -1, -1, "123456789012", -1, "123456789012-8" }, /* First check digit 10 (A) goes to hyphen */ - /* 7*/ { BARCODE_CODE11, -1, BARCODE_RAW_TEXT, "123456789012", -1, "123456789012-8" }, /* No difference */ + /* 7*/ { BARCODE_CODE11, -1, BARCODE_CONTENT_SEGS, "123456789012", -1, "123456789012-8" }, /* No difference */ }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -136,17 +136,17 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, expected_length, symbol->raw_segs[0].source, data[i].expected, expected_length); + i, expected_length, symbol->content_segs[0].source, data[i].expected, expected_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_code128.c b/backend/tests/test_code128.c index 02fbe9f7..2b2241c1 100644 --- a/backend/tests/test_code128.c +++ b/backend/tests/test_code128.c @@ -202,8 +202,8 @@ static void test_hrt(const testCtx *const p_ctx) { const char *expected; int expected_length; - const char *expected_raw; - int expected_raw_length; + const char *expected_content; + int expected_content_length; int zxingcpp_cmp; }; /* @@ -212,45 +212,45 @@ static void test_hrt(const testCtx *const p_ctx) { /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_CODE128, UNICODE_MODE, -1, -1, "1234567890", -1, "1234567890", -1, "", -1, 1 }, - /* 1*/ { BARCODE_CODE128, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "1234567890", -1, "1234567890", -1, "1234567890", -1, 1 }, + /* 1*/ { BARCODE_CODE128, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "1234567890", -1, "1234567890", -1, "1234567890", -1, 1 }, /* 2*/ { BARCODE_CODE128, UNICODE_MODE, -1, -1, "\000ABC\000DEF\000", 9, " ABC DEF ", -1, "", -1, 1 }, - /* 3*/ { BARCODE_CODE128, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "\000ABC\000DEF\000", 9, " ABC DEF ", -1, "\000ABC\000DEF\000", 9, 1 }, /* No replacements */ + /* 3*/ { BARCODE_CODE128, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "\000ABC\000DEF\000", 9, " ABC DEF ", -1, "\000ABC\000DEF\000", 9, 1 }, /* No replacements */ /* 4*/ { BARCODE_CODE128AB, UNICODE_MODE, -1, -1, "12345\00067890", 11, "12345 67890", -1, "", -1, 1 }, - /* 5*/ { BARCODE_CODE128AB, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "12345\00067890", 11, "12345 67890", -1, "12345\00067890", 11, 1 }, + /* 5*/ { BARCODE_CODE128AB, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "12345\00067890", 11, "12345 67890", -1, "12345\00067890", 11, 1 }, /* 6*/ { BARCODE_CODE128, UNICODE_MODE, -1, -1, "12345\01167890\037\177", -1, "12345 67890 ", -1, "", -1, 1 }, - /* 7*/ { BARCODE_CODE128, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "12345\01167890\037\177", -1, "12345 67890 ", -1, "12345\01167890\037\177", -1, 1 }, + /* 7*/ { BARCODE_CODE128, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "12345\01167890\037\177", -1, "12345 67890 ", -1, "12345\01167890\037\177", -1, 1 }, /* 8*/ { BARCODE_CODE128, UNICODE_MODE, -1, -1, "abcdé", -1, "abcdé", -1, "", -1, 1 }, - /* 9*/ { BARCODE_CODE128, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "abcdé", -1, "abcdé", -1, "abcdé", -1, 1 }, /* Now UTF-8, not converted */ + /* 9*/ { BARCODE_CODE128, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "abcdé", -1, "abcdé", -1, "abcdé", -1, 1 }, /* Now UTF-8, not converted */ /* 10*/ { BARCODE_CODE128, UNICODE_MODE, -1, -1, "abcdé\302\240", -1, "abcdé\302\240", -1, "", -1, 1 }, /* \302\240 (U+A0) NBSP */ - /* 11*/ { BARCODE_CODE128, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "abcdé\302\240", -1, "abcdé\302\240", -1, "abcdé\302\240", -1, 1 }, + /* 11*/ { BARCODE_CODE128, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "abcdé\302\240", -1, "abcdé\302\240", -1, "abcdé\302\240", -1, 1 }, /* 12*/ { BARCODE_CODE128, DATA_MODE, -1, -1, "abcd\351", -1, "abcdé", -1, "", -1, 899 }, - /* 13*/ { BARCODE_CODE128, DATA_MODE, -1, BARCODE_RAW_TEXT, "abcd\351", -1, "abcdé", -1, "abcd\351", -1, 899 }, + /* 13*/ { BARCODE_CODE128, DATA_MODE, -1, BARCODE_CONTENT_SEGS, "abcd\351", -1, "abcdé", -1, "abcd\351", -1, 899 }, /* 14*/ { BARCODE_CODE128, DATA_MODE, -1, -1, "ab\240cd\351", -1, "ab\302\240cdé", -1, "", -1, 899 }, /* \240 (U+A0) NBSP */ - /* 15*/ { BARCODE_CODE128, DATA_MODE, -1, BARCODE_RAW_TEXT, "ab\240cd\351", -1, "ab\302\240cdé", -1, "ab\240cd\351", -1, 899 }, + /* 15*/ { BARCODE_CODE128, DATA_MODE, -1, BARCODE_CONTENT_SEGS, "ab\240cd\351", -1, "ab\302\240cdé", -1, "ab\240cd\351", -1, 899 }, /* 16*/ { BARCODE_CODE128, DATA_MODE, -1, -1, "ab\200cd\351", -1, "ab cdé", -1, "", -1, 899 }, /* \200 (U+80) non-ISO/IEC 8859-1 */ - /* 17*/ { BARCODE_CODE128, DATA_MODE, -1, BARCODE_RAW_TEXT, "ab\200cd\351", -1, "ab cdé", -1, "ab\200cd\351", -1, 899 }, + /* 17*/ { BARCODE_CODE128, DATA_MODE, -1, BARCODE_CONTENT_SEGS, "ab\200cd\351", -1, "ab cdé", -1, "ab\200cd\351", -1, 899 }, /* 18*/ { BARCODE_CODE128, EXTRA_ESCAPE_MODE, -1, -1, "\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C123456789012345678", -1, "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678", -1, "", -1, 1 }, /* Max length 198 + 19 special escapes = 99 + 19*3 = 255 */ - /* 19*/ { BARCODE_CODE128, EXTRA_ESCAPE_MODE, -1, BARCODE_RAW_TEXT, "\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C123456789012345678", -1, "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678", -1, "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678", -1, 1 }, + /* 19*/ { BARCODE_CODE128, EXTRA_ESCAPE_MODE, -1, BARCODE_CONTENT_SEGS, "\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C1234567890\\^C123456789012345678", -1, "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678", -1, "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678", -1, 1 }, /* 20*/ { BARCODE_CODE128AB, UNICODE_MODE, -1, -1, "abcdé", -1, "abcdé", -1, "", -1, 1 }, - /* 21*/ { BARCODE_CODE128AB, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "abcdé", -1, "abcdé", -1, "abcdé", -1, 1 }, + /* 21*/ { BARCODE_CODE128AB, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "abcdé", -1, "abcdé", -1, "abcdé", -1, 1 }, /* 22*/ { BARCODE_CODE128AB, DATA_MODE, -1, -1, "abcd\351", -1, "abcdé", -1, "", -1, 899 }, - /* 23*/ { BARCODE_CODE128AB, DATA_MODE, -1, BARCODE_RAW_TEXT, "abcd\351", -1, "abcdé", -1, "abcd\351", -1, 899 }, + /* 23*/ { BARCODE_CODE128AB, DATA_MODE, -1, BARCODE_CONTENT_SEGS, "abcd\351", -1, "abcdé", -1, "abcd\351", -1, 899 }, /* 24*/ { BARCODE_HIBC_128, UNICODE_MODE, -1, -1, "1234567890", -1, "*+12345678900*", -1, "", -1, 1 }, - /* 25*/ { BARCODE_HIBC_128, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "1234567890", -1, "*+12345678900*", -1, "+12345678900", -1, 1 }, + /* 25*/ { BARCODE_HIBC_128, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "1234567890", -1, "*+12345678900*", -1, "+12345678900", -1, 1 }, /* 26*/ { BARCODE_HIBC_128, UNICODE_MODE, -1, -1, "a99912345", -1, "*+A999123457*", -1, "", -1, 1 }, /* Converts to upper */ - /* 27*/ { BARCODE_HIBC_128, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "a99912345", -1, "*+A999123457*", -1, "+A999123457", -1, 1 }, + /* 27*/ { BARCODE_HIBC_128, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "a99912345", -1, "*+A999123457*", -1, "+A999123457", -1, 1 }, /* 28*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "000393206219912345678101040", -1, "0003 932 0621 9912 3456 78 101 040 9", -1, "", -1, 1 }, /* DPDAPPD 4.0.2 - Illustration 7 */ - /* 29*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "000393206219912345678101040", -1, "0003 932 0621 9912 3456 78 101 040 9", -1, "%000393206219912345678101040", -1, 1 }, /* Includes '%', no spaces, no check digit */ + /* 29*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "000393206219912345678101040", -1, "0003 932 0621 9912 3456 78 101 040 9", -1, "%000393206219912345678101040", -1, 1 }, /* Includes '%', no spaces, no check digit */ /* 30*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "007110601782532948375101276", -1, "0071 106 0178 2532 9483 75 101 276 X", -1, "", -1, 1 }, /* DPDAPPD 4.0.2 - Illustration 6, figure's HRT seems incorrect */ - /* 31*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "007110601782532948375101276", -1, "0071 106 0178 2532 9483 75 101 276 X", -1, "%007110601782532948375101276", -1, 1 }, + /* 31*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "007110601782532948375101276", -1, "0071 106 0178 2532 9483 75 101 276 X", -1, "%007110601782532948375101276", -1, 1 }, /* 32*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020028101276", -1, "0081 827 0998 0000 0200 28 101 276 B", -1, "", -1, 1 }, /* DPDPLS Section 4 */ - /* 33*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "008182709980000020028101276", -1, "0081 827 0998 0000 0200 28 101 276 B", -1, "%008182709980000020028101276", -1, 1 }, + /* 33*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "008182709980000020028101276", -1, "0081 827 0998 0000 0200 28 101 276 B", -1, "%008182709980000020028101276", -1, 1 }, /* 34*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "007110601632532948375179276", -1, "0071 106 0163 2532 9483 75 179 276 A", -1, "", -1, 1 }, /* DPDPLS Section 4.6 */ - /* 35*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "007110601632532948375179276", -1, "0071 106 0163 2532 9483 75 179 276 A", -1, "%007110601632532948375179276", -1, 1 }, + /* 35*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "007110601632532948375179276", -1, "0071 106 0163 2532 9483 75 179 276 A", -1, "%007110601632532948375179276", -1, 1 }, /* 36*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "001990009980000020084109203", -1, "0019 900 0998 0000 0200 84 109 203 1", -1, "", -1, 1 }, /* DPDPLS Section 5.1 */ - /* 37*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "001990009980000020084109203", -1, "0019 900 0998 0000 0200 84 109 203 1", -1, "%001990009980000020084109203", -1, 1 }, + /* 37*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "001990009980000020084109203", -1, "0019 900 0998 0000 0200 84 109 203 1", -1, "%001990009980000020084109203", -1, 1 }, /* 38*/ { BARCODE_DPD, UNICODE_MODE, 1, -1, "007110601632532948375101276", -1, "0071 106 0163 2532 9483 75 101 276 O", -1, "", -1, 1 }, /* DPDPLS Section 6.1.2 relabel, figure is actually 8.7.2 with mislabelled HRT */ - /* 39*/ { BARCODE_DPD, UNICODE_MODE, 1, BARCODE_RAW_TEXT, "007110601632532948375101276", -1, "0071 106 0163 2532 9483 75 101 276 O", -1, "007110601632532948375101276", -1, 1 }, /* No '%' */ + /* 39*/ { BARCODE_DPD, UNICODE_MODE, 1, BARCODE_CONTENT_SEGS, "007110601632532948375101276", -1, "0071 106 0163 2532 9483 75 101 276 O", -1, "007110601632532948375101276", -1, 1 }, /* No '%' */ /* 40*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020029136276", -1, "0081 827 0998 0000 0200 29 136 276 3", -1, "", -1, 1 }, /* DPDPLS Section 8.1 */ /* 41*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "001234509980000020031105276", -1, "0012 345 0998 0000 0200 31 105 276 L", -1, "", -1, 1 }, /* DPDPLS Section 8.2 */ /* 42*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020032154276", -1, "0081 827 0998 0000 0200 32 154 276 J", -1, "", -1, 1 }, /* DPDPLS Section 8.3 */ @@ -263,30 +263,30 @@ static void test_hrt(const testCtx *const p_ctx) { /* 49*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "007855009980000020041302840", -1, "0078 550 0998 0000 0200 41 302 840 U", -1, "", -1, 1 }, /* DPDPLS Section 8.5.6 */ /* 50*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020042102276", -1, "0081 827 0998 0000 0200 42 102 276 R", -1, "", -1, 1 }, /* DPDPLS Section 8.6.1 */ /* 51*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020043113276", -1, "0081 827 0998 0000 0200 43 113 276 Y", -1, "", -1, 1 }, /* DPDPLS Section 8.7.1 */ - /* 52*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "008182709980000020043113276", -1, "0081 827 0998 0000 0200 43 113 276 Y", -1, "%008182709980000020043113276", -1, 1 }, + /* 52*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "008182709980000020043113276", -1, "0081 827 0998 0000 0200 43 113 276 Y", -1, "%008182709980000020043113276", -1, 1 }, /* 53*/ { BARCODE_DPD, UNICODE_MODE, 1, -1, "006376209980000020044118276", -1, "0063 762 0998 0000 0200 44 118 276 I", -1, "", -1, 1 }, /* DPDPLS Section 8.7.2 relabel */ - /* 54*/ { BARCODE_DPD, UNICODE_MODE, 1, BARCODE_RAW_TEXT, "006376209980000020044118276", -1, "0063 762 0998 0000 0200 44 118 276 I", -1, "006376209980000020044118276", -1, 1 }, + /* 54*/ { BARCODE_DPD, UNICODE_MODE, 1, BARCODE_CONTENT_SEGS, "006376209980000020044118276", -1, "0063 762 0998 0000 0200 44 118 276 I", -1, "006376209980000020044118276", -1, 1 }, /* 55*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "007160009980000020050294276", -1, "0071 600 0998 0000 0200 50 294 276 C", -1, "", -1, 1 }, /* DPDPLS Section 8.8 */ /* 56*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020045327276", -1, "0081 827 0998 0000 0200 45 327 276 N", -1, "", -1, 1 }, /* DPDPLS Section 8.9.1 */ /* 57*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "006374309980000020047337276", -1, "0063 743 0998 0000 0200 47 337 276 O", -1, "", -1, 1 }, /* DPDPLS Section 8.9.2 */ - /* 58*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "006374309980000020047337276", -1, "0063 743 0998 0000 0200 47 337 276 O", -1, "%006374309980000020047337276", -1, 1 }, + /* 58*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "006374309980000020047337276", -1, "0063 743 0998 0000 0200 47 337 276 O", -1, "%006374309980000020047337276", -1, 1 }, /* 59*/ { BARCODE_DPD, UNICODE_MODE, 1, -1, "006374109980978004757332276", -1, "0063 741 0998 0978 0047 57 332 276 M", -1, "", -1, 1 }, /* DPDPLS Section 8.9.3 relabel, figure's HRT seems incorrect */ - /* 60*/ { BARCODE_DPD, UNICODE_MODE, 1, BARCODE_RAW_TEXT, "006374109980978004757332276", -1, "0063 741 0998 0978 0047 57 332 276 M", -1, "006374109980978004757332276", -1, 1 }, + /* 60*/ { BARCODE_DPD, UNICODE_MODE, 1, BARCODE_CONTENT_SEGS, "006374109980978004757332276", -1, "0063 741 0998 0978 0047 57 332 276 M", -1, "006374109980978004757332276", -1, 1 }, /* 61*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020051106276", -1, "0081 827 0998 0000 0200 51 106 276 M", -1, "", -1, 1 }, /* DPDPLS Section 9.1 */ /* 62*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020052110276", -1, "0081 827 0998 0000 0200 52 110 276 W", -1, "", -1, 1 }, /* DPDPLS Section 9.2 */ /* 63*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020053161276", -1, "0081 827 0998 0000 0200 53 161 276 O", -1, "", -1, 1 }, /* DPDPLS Section 9.3 */ /* 64*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020054352276", -1, "0081 827 0998 0000 0200 54 352 276 B", -1, "", -1, 1 }, /* DPDPLS Section 9.4 */ /* 65*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020055191276", -1, "0081 827 0998 0000 0200 55 191 276 A", -1, "", -1, 1 }, /* DPDPLS Section 9.5 */ /* 66*/ { BARCODE_DPD, UNICODE_MODE, -1, -1, "008182709980000020056237276", -1, "0081 827 0998 0000 0200 56 237 276 K", -1, "", -1, 1 }, /* DPDPLS Section 9.6 */ - /* 67*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "008182709980000020056237276", -1, "0081 827 0998 0000 0200 56 237 276 K", -1, "%008182709980000020056237276", -1, 1 }, + /* 67*/ { BARCODE_DPD, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "008182709980000020056237276", -1, "0081 827 0998 0000 0200 56 237 276 K", -1, "%008182709980000020056237276", -1, 1 }, /* 68*/ { BARCODE_UPU_S10, UNICODE_MODE, -1, -1, "EE876543216CA", -1, "EE 876 543 216 CA", -1, "", -1, 1 }, /* UPU S10 Annex A */ - /* 69*/ { BARCODE_UPU_S10, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "EE876543216CA", -1, "EE 876 543 216 CA", -1, "EE876543216CA", -1, 1 }, /* No spaces */ + /* 69*/ { BARCODE_UPU_S10, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "EE876543216CA", -1, "EE 876 543 216 CA", -1, "EE876543216CA", -1, 1 }, /* No spaces */ /* BARCODE_GS1_128, BARCODE_EAN14, BARCODE_NVE18 hrt tested in test_gs1.c */ }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; char escaped[1024]; char escaped2[1024]; @@ -313,8 +313,8 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, data[i].option_2, -1 /*option_3*/, data[i].output_options, data[i].data, data[i].length, debug); expected_length = data[i].expected_length == -1 ? (int) strlen(data[i].expected) : data[i].expected_length; - expected_raw_length = data[i].expected_raw_length == -1 ? (int) strlen(data[i].expected_raw) - : data[i].expected_raw_length; + expected_content_length = data[i].expected_content_length == -1 ? (int) strlen(data[i].expected_content) + : data[i].expected_content_length; ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -325,18 +325,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text, data[i].expected, expected_length); if (ret < ZINT_ERROR) { - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, + data[i].expected_content, expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } if (do_bwipp && testUtilCanBwipp(i, symbol, -1, data[i].option_2, -1, debug)) { diff --git a/backend/tests/test_code16k.c b/backend/tests/test_code16k.c index 56acb5bb..6be6affb 100644 --- a/backend/tests/test_code16k.c +++ b/backend/tests/test_code16k.c @@ -465,16 +465,16 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { DATA_MODE, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 3*/ { DATA_MODE, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 3*/ { DATA_MODE, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 4*/ { GS1_MODE, -1, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "", -1, 0 }, - /* 5*/ { GS1_MODE, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, + /* 5*/ { GS1_MODE, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -505,23 +505,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } diff --git a/backend/tests/test_code49.c b/backend/tests/test_code49.c index 843168c4..b8801636 100644 --- a/backend/tests/test_code49.c +++ b/backend/tests/test_code49.c @@ -318,16 +318,16 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, "AB\000123", 6, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "AB\000123", 6, 0, 0, "AB\000123", 6, 3 }, + /* 1*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "AB\000123", 6, 0, 0, "AB\000123", 6, 3 }, /* 2*/ { DATA_MODE, -1, "AB\000123", 6, 0, 0, "", -1, 0 }, - /* 3*/ { DATA_MODE, BARCODE_RAW_TEXT, "AB\000123", 6, 0, 0, "AB\000123", 6, 3 }, + /* 3*/ { DATA_MODE, BARCODE_CONTENT_SEGS, "AB\000123", 6, 0, 0, "AB\000123", 6, 3 }, /* 4*/ { GS1_MODE, -1, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "", -1, 0 }, - /* 5*/ { GS1_MODE, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, + /* 5*/ { GS1_MODE, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -358,23 +358,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } diff --git a/backend/tests/test_common.c b/backend/tests/test_common.c index 95c5969b..2093d297 100644 --- a/backend/tests/test_common.c +++ b/backend/tests/test_common.c @@ -1053,15 +1053,15 @@ static void test_hrt_conv_gs1_brackets_nochk(const testCtx *const p_ctx) { testFinish(); } -static void test_rt_cpy_segs(const testCtx *const p_ctx) { +static void test_ct_cpy_segs(const testCtx *const p_ctx) { int debug = p_ctx->debug; struct item { int seg_count; struct zint_seg segs[3]; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { @@ -1093,31 +1093,31 @@ static void test_rt_cpy_segs(const testCtx *const p_ctx) { assert_nonzero(data[i].seg_count, "i:%d seg_count zero\n", i); - ret = z_rt_cpy_segs(symbol, data[i].segs, data[i].seg_count); - assert_zero(ret, "i:%d rt_cpy_segs %d != 0\n", i, ret); + ret = z_ct_cpy_segs(symbol, data[i].segs, data[i].seg_count); + assert_zero(ret, "i:%d z_ct_cpy_segs %d != 0\n", i, ret); - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_equal(symbol->raw_seg_count, data[i].seg_count, "i:%d raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].seg_count); + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_equal(symbol->content_seg_count, data[i].seg_count, "i:%d content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].seg_count); for (seg_idx = 0; seg_idx < data[i].seg_count; seg_idx++) { - assert_nonnull(&symbol->raw_segs[seg_idx], "i:%d raw_segs[%d] NULL\n", i, seg_idx); - assert_nonnull(symbol->raw_segs[seg_idx].source, "i:%d raw_segs[%d].source NULL\n", i, seg_idx); + assert_nonnull(&symbol->content_segs[seg_idx], "i:%d content_segs[%d] NULL\n", i, seg_idx); + assert_nonnull(symbol->content_segs[seg_idx].source, "i:%d content_segs[%d].source NULL\n", i, seg_idx); - expected_length = data[i].expected_raw_segs[seg_idx].length; - expected_source = data[i].expected_raw_segs[seg_idx].source; - expected_eci = data[i].expected_raw_segs[seg_idx].eci; + expected_length = data[i].expected_content_segs[seg_idx].length; + expected_source = data[i].expected_content_segs[seg_idx].source; + expected_eci = data[i].expected_content_segs[seg_idx].eci; - assert_equal(symbol->raw_segs[seg_idx].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, seg_idx, symbol->raw_segs[seg_idx].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[seg_idx].source, expected_source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, seg_idx, - testUtilEscape(ZCCP(symbol->raw_segs[seg_idx].source), symbol->raw_segs[seg_idx].length, + assert_equal(symbol->content_segs[seg_idx].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, seg_idx, symbol->content_segs[seg_idx].length, expected_length); + assert_zero(memcmp(symbol->content_segs[seg_idx].source, expected_source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, seg_idx, + testUtilEscape(ZCCP(symbol->content_segs[seg_idx].source), symbol->content_segs[seg_idx].length, escaped, sizeof(escaped)), testUtilEscape(ZCCP(expected_source), expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[seg_idx].eci, expected_eci, "i:%d raw_segs[%d].eci %d != expected_eci %d\n", - i, seg_idx, symbol->raw_segs[seg_idx].eci, expected_eci); + assert_equal(symbol->content_segs[seg_idx].eci, expected_eci, "i:%d content_segs[%d].eci %d != expected_eci %d\n", + i, seg_idx, symbol->content_segs[seg_idx].eci, expected_eci); } ZBarcode_Clear(symbol); @@ -1126,7 +1126,7 @@ static void test_rt_cpy_segs(const testCtx *const p_ctx) { testFinish(); } -static void test_rt_cpy(const testCtx *const p_ctx) { +static void test_ct_cpy(const testCtx *const p_ctx) { int debug = p_ctx->debug; struct item { @@ -1171,27 +1171,27 @@ static void test_rt_cpy(const testCtx *const p_ctx) { length = data[i].length == -1 ? (int) strlen(data[i].source) : data[i].length; if ((cat_length = data[i].cat_length == -1 ? (int) strlen(data[i].cat) : data[i].cat_length)) { - ret = z_rt_cpy_cat(symbol, TCU(data[i].source), length, data[i].separator, TCU(data[i].cat), cat_length); - assert_zero(ret, "i:%d rt_cpy_cat %d != 0\n", i, ret); + ret = z_ct_cpy_cat(symbol, TCU(data[i].source), length, data[i].separator, TCU(data[i].cat), cat_length); + assert_zero(ret, "i:%d z_ct_cpy_cat %d != 0\n", i, ret); } else { - ret = z_rt_cpy(symbol, TCU(data[i].source), length); - assert_zero(ret, "i:%d rt_cpy %d != 0\n", i, ret); + ret = z_ct_cpy(symbol, TCU(data[i].source), length); + assert_zero(ret, "i:%d z_ct_cpy %d != 0\n", i, ret); } - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_eci, - "i:%d raw_segs[0].eci %d != expected_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_eci, + "i:%d content_segs[0].eci %d != expected_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_eci); ZBarcode_Clear(symbol); } @@ -1199,7 +1199,7 @@ static void test_rt_cpy(const testCtx *const p_ctx) { testFinish(); } -static void test_rt_cpy_iso8859_1(const testCtx *const p_ctx) { +static void test_ct_cpy_iso8859_1(const testCtx *const p_ctx) { int debug = p_ctx->debug; struct item { @@ -1239,23 +1239,23 @@ static void test_rt_cpy_iso8859_1(const testCtx *const p_ctx) { length = data[i].length == -1 ? (int) strlen(data[i].source) : data[i].length; - ret = z_rt_cpy_iso8859_1(symbol, TCU(data[i].source), length); - assert_zero(ret, "i:%d z_rt_cpy_iso8859_1 %d != 0\n", i, ret); + ret = z_ct_cpy_iso8859_1(symbol, TCU(data[i].source), length); + assert_zero(ret, "i:%d z_ct_cpy_iso8859_1 %d != 0\n", i, ret); - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_eci, - "i:%d raw_segs[0].eci %d != expected_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_eci, + "i:%d content_segs[0].eci %d != expected_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_eci); ZBarcode_Clear(symbol); } @@ -1263,7 +1263,7 @@ static void test_rt_cpy_iso8859_1(const testCtx *const p_ctx) { testFinish(); } -static void test_rt_printf_256(const testCtx *const p_ctx) { +static void test_ct_printf_256(const testCtx *const p_ctx) { int debug = p_ctx->debug; struct item { @@ -1301,27 +1301,27 @@ static void test_rt_printf_256(const testCtx *const p_ctx) { expected_length = (int) strlen(data[i].expected); if (data[i].num_args == 1) { - ret = z_rt_printf_256(symbol, data[i].fmt, data[i].data1); - assert_zero(ret, "i:%d rt_printf_256 1 arg ret %d != 0\n", i, ret); + ret = z_ct_printf_256(symbol, data[i].fmt, data[i].data1); + assert_zero(ret, "i:%d z_ct_printf_256 1 arg ret %d != 0\n", i, ret); } else if (data[i].num_args == 2) { - ret = z_rt_printf_256(symbol, data[i].fmt, data[i].data1, data[i].data2); - assert_zero(ret, "i:%d rt_printf_256 2 args ret %d != 0\n", i, ret); + ret = z_ct_printf_256(symbol, data[i].fmt, data[i].data1, data[i].data2); + assert_zero(ret, "i:%d z_ct_printf_256 2 args ret %d != 0\n", i, ret); } else { assert_zero(1, "i:%d, bad num_args\n", i); } - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, 3, "i:%d raw_segs[0].eci %d != 3\n", i, symbol->raw_segs[0].eci); + assert_equal(symbol->content_segs[0].eci, 3, "i:%d content_segs[0].eci %d != 3\n", i, symbol->content_segs[0].eci); ZBarcode_Clear(symbol); } @@ -1455,10 +1455,10 @@ int main(int argc, char *argv[]) { { "test_hrt_cpy_cat_nochk", test_hrt_cpy_cat_nochk }, { "test_hrt_printf_nochk", test_hrt_printf_nochk }, { "test_hrt_conv_gs1_brackets_nochk", test_hrt_conv_gs1_brackets_nochk }, - { "test_rt_cpy_segs", test_rt_cpy_segs }, - { "test_rt_cpy", test_rt_cpy }, - { "test_rt_cpy_iso8859_1", test_rt_cpy_iso8859_1 }, - { "test_rt_printf_256", test_rt_printf_256 }, + { "test_ct_cpy_segs", test_ct_cpy_segs }, + { "test_ct_cpy", test_ct_cpy }, + { "test_ct_cpy_iso8859_1", test_ct_cpy_iso8859_1 }, + { "test_ct_printf_256", test_ct_printf_256 }, { "test_set_height", test_set_height }, { "test_debug_test_codeword_dump_int", test_debug_test_codeword_dump_int }, }; diff --git a/backend/tests/test_composite.c b/backend/tests/test_composite.c index 449c0074..ddee9396 100644 --- a/backend/tests/test_composite.c +++ b/backend/tests/test_composite.c @@ -3511,22 +3511,22 @@ static void test_hrt(const testCtx *const p_ctx) { int ret; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_EAN8_CC, -1, -1, "1234567", "[20]12", 0, "12345670", "" }, /* 1*/ { BARCODE_EANX_CC, -1, -1, "1234567", "[20]12", 0, "12345670", "" }, /* EAN-8 */ - /* 2*/ { BARCODE_EAN8_CC, -1, BARCODE_RAW_TEXT, "1234567", "[20]12", 0, "12345670", "12345670|2012" }, - /* 3*/ { BARCODE_EANX_CC, -1, BARCODE_RAW_TEXT, "1234567", "[20]12", 0, "12345670", "12345670|2012" }, /* EAN-8 */ + /* 2*/ { BARCODE_EAN8_CC, -1, BARCODE_CONTENT_SEGS, "1234567", "[20]12", 0, "12345670", "12345670|2012" }, + /* 3*/ { BARCODE_EANX_CC, -1, BARCODE_CONTENT_SEGS, "1234567", "[20]12", 0, "12345670", "12345670|2012" }, /* EAN-8 */ /* 4*/ { BARCODE_EAN13_CC, -1, -1, "123456789012", "[20]12", 0, "1234567890128", "" }, /* 5*/ { BARCODE_EANX_CC, -1, -1, "123456789012", "[20]12", 0, "1234567890128", "" }, /* EAN-13 */ - /* 6*/ { BARCODE_EAN13_CC, -1, BARCODE_RAW_TEXT, "123456789012", "[20]12", 0, "1234567890128", "1234567890128|2012" }, - /* 7*/ { BARCODE_EANX_CC, -1, BARCODE_RAW_TEXT, "123456789012", "[20]12", 0, "1234567890128", "1234567890128|2012" }, /* EAN-13 */ + /* 6*/ { BARCODE_EAN13_CC, -1, BARCODE_CONTENT_SEGS, "123456789012", "[20]12", 0, "1234567890128", "1234567890128|2012" }, + /* 7*/ { BARCODE_EANX_CC, -1, BARCODE_CONTENT_SEGS, "123456789012", "[20]12", 0, "1234567890128", "1234567890128|2012" }, /* EAN-13 */ /* 8*/ { BARCODE_EAN13_CC, -1, -1, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "" }, /* 9*/ { BARCODE_EANX_CC, -1, -1, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "" }, /* EAN-13 */ - /* 10*/ { BARCODE_EAN13_CC, -1, BARCODE_RAW_TEXT, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "1234567890128|10LOT123\0352012" }, - /* 11*/ { BARCODE_EANX_CC, -1, BARCODE_RAW_TEXT, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "1234567890128|10LOT123\0352012" }, /* EAN-13 */ + /* 10*/ { BARCODE_EAN13_CC, -1, BARCODE_CONTENT_SEGS, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "1234567890128|10LOT123\0352012" }, + /* 11*/ { BARCODE_EANX_CC, -1, BARCODE_CONTENT_SEGS, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "1234567890128|10LOT123\0352012" }, /* EAN-13 */ /* 12*/ { BARCODE_EAN13_CC, -1, -1, "1234567890128", "[20]12", 0, "1234567890128", "" }, /* 13*/ { BARCODE_EANX_CC, -1, -1, "1234567890128", "[20]12", 0, "1234567890128", "" }, /* 14*/ { BARCODE_EAN13_CC, -1, -1, "1234567890123", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, @@ -3539,33 +3539,33 @@ static void test_hrt(const testCtx *const p_ctx) { /* 21*/ { BARCODE_EANX_CC, GS1NOCHECK_MODE, -1, "1234567890128", "[20]1A", 0, "1234567890128", "" }, /* 22*/ { BARCODE_EAN13_CC, -1, -1, "1234567890128+12", "[20]12", 0, "1234567890128+12", "" }, /* 23*/ { BARCODE_EANX_CC, -1, -1, "1234567890128+12", "[20]12", 0, "1234567890128+12", "" }, - /* 24*/ { BARCODE_EAN13_CC, -1, BARCODE_RAW_TEXT, "1234567890128+12", "[20]12", 0, "1234567890128+12", "123456789012812|2012" }, - /* 25*/ { BARCODE_EANX_CC, -1, BARCODE_RAW_TEXT, "1234567890128+12", "[20]12", 0, "1234567890128+12", "123456789012812|2012" }, + /* 24*/ { BARCODE_EAN13_CC, -1, BARCODE_CONTENT_SEGS, "1234567890128+12", "[20]12", 0, "1234567890128+12", "123456789012812|2012" }, + /* 25*/ { BARCODE_EANX_CC, -1, BARCODE_CONTENT_SEGS, "1234567890128+12", "[20]12", 0, "1234567890128+12", "123456789012812|2012" }, /* 26*/ { BARCODE_DBAR_OMN_CC, -1, -1, "1234567890123", "[20]12", 0, "(01)12345678901231", "" }, - /* 27*/ { BARCODE_DBAR_OMN_CC, -1, BARCODE_RAW_TEXT, "1234567890123", "[20]12", 0, "(01)12345678901231", "0112345678901231|2012" }, + /* 27*/ { BARCODE_DBAR_OMN_CC, -1, BARCODE_CONTENT_SEGS, "1234567890123", "[20]12", 0, "(01)12345678901231", "0112345678901231|2012" }, /* 28*/ { BARCODE_DBAR_OMN_CC, -1, -1, "12345678901231", "[20]12", 0, "(01)12345678901231", "" }, /* 29*/ { BARCODE_DBAR_OMN_CC, -1, -1, "12345678901232", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* 30*/ { BARCODE_DBAR_OMN_CC, GS1NOCHECK_MODE, -1, "12345678901232", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* Still checked */ /* 31*/ { BARCODE_DBAR_OMN_CC, -1, -1, "12345678901231", "[20]1A", ZINT_WARN_NONCOMPLIANT, "(01)12345678901231", "" }, /* AI (20) should be 2 nos. */ /* 32*/ { BARCODE_DBAR_OMN_CC, GS1NOCHECK_MODE, -1, "12345678901231", "[20]1A", 0, "(01)12345678901231", "" }, /* 33*/ { BARCODE_DBAR_LTD_CC, -1, -1, "1234567890123", "[20]12", 0, "(01)12345678901231", "" }, - /* 34*/ { BARCODE_DBAR_LTD_CC, -1, BARCODE_RAW_TEXT, "1234567890123", "[20]12", 0, "(01)12345678901231", "0112345678901231|2012" }, + /* 34*/ { BARCODE_DBAR_LTD_CC, -1, BARCODE_CONTENT_SEGS, "1234567890123", "[20]12", 0, "(01)12345678901231", "0112345678901231|2012" }, /* 35*/ { BARCODE_DBAR_LTD_CC, -1, -1, "12345678901231", "[20]12", 0, "(01)12345678901231", "" }, /* 36*/ { BARCODE_DBAR_LTD_CC, -1, -1, "12345678901232", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* 37*/ { BARCODE_DBAR_LTD_CC, GS1NOCHECK_MODE, -1, "12345678901232", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* Still checked */ /* 38*/ { BARCODE_DBAR_LTD_CC, -1, -1, "12345678901231", "[20]1A", ZINT_WARN_NONCOMPLIANT, "(01)12345678901231", "" }, /* AI (20) should be 2 nos. */ /* 39*/ { BARCODE_DBAR_LTD_CC, GS1NOCHECK_MODE, -1, "12345678901231", "[20]1A", 0, "(01)12345678901231", "" }, /* 40*/ { BARCODE_UPCA_CC, -1, -1, "12345678901", "[20]12", 0, "123456789012", "" }, - /* 41*/ { BARCODE_UPCA_CC, -1, BARCODE_RAW_TEXT, "12345678901", "[20]12", 0, "123456789012", "0123456789012|2012" }, + /* 41*/ { BARCODE_UPCA_CC, -1, BARCODE_CONTENT_SEGS, "12345678901", "[20]12", 0, "123456789012", "0123456789012|2012" }, /* 42*/ { BARCODE_UPCA_CC, -1, -1, "123456789012", "[20]12", 0, "123456789012", "" }, /* 43*/ { BARCODE_UPCA_CC, -1, -1, "123456789013", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* 44*/ { BARCODE_UPCA_CC, GS1NOCHECK_MODE, -1, "123456789013", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* Still checked */ /* 45*/ { BARCODE_UPCA_CC, -1, -1, "123456789012", "[20]1A", ZINT_WARN_NONCOMPLIANT, "123456789012", "" }, /* AI (20) should be 2 nos. */ /* 46*/ { BARCODE_UPCA_CC, GS1NOCHECK_MODE, -1, "123456789012", "[20]1A", 0, "123456789012", "" }, /* 47*/ { BARCODE_UPCA_CC, -1, -1, "123456789012+123", "[20]12", 0, "123456789012+00123", "" }, - /* 48*/ { BARCODE_UPCA_CC, -1, BARCODE_RAW_TEXT, "123456789012+123", "[20]12", 0, "123456789012+00123", "012345678901200123|2012" }, + /* 48*/ { BARCODE_UPCA_CC, -1, BARCODE_CONTENT_SEGS, "123456789012+123", "[20]12", 0, "123456789012+00123", "012345678901200123|2012" }, /* 49*/ { BARCODE_UPCE_CC, -1, -1, "123456", "[20]12", 0, "01234565", "" }, - /* 50*/ { BARCODE_UPCE_CC, -1, BARCODE_RAW_TEXT, "123456", "[20]12", 0, "01234565", "0012345000065|2012" }, + /* 50*/ { BARCODE_UPCE_CC, -1, BARCODE_CONTENT_SEGS, "123456", "[20]12", 0, "01234565", "0012345000065|2012" }, /* 51*/ { BARCODE_UPCE_CC, -1, -1, "1234567", "[20]12", 0, "12345670", "" }, /* 52*/ { BARCODE_UPCE_CC, -1, -1, "12345670", "[20]12", 0, "12345670", "" }, /* 53*/ { BARCODE_UPCE_CC, -1, -1, "12345671", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, @@ -3574,16 +3574,16 @@ static void test_hrt(const testCtx *const p_ctx) { /* 56*/ { BARCODE_UPCE_CC, -1, -1, "1234567", "[20]1A", ZINT_WARN_NONCOMPLIANT, "12345670", "" }, /* AI (20) should be 2 nos. */ /* 57*/ { BARCODE_UPCE_CC, GS1NOCHECK_MODE, -1, "1234567", "[20]1A", 0, "12345670", "" }, /* 58*/ { BARCODE_UPCE_CC, -1, -1, "1234567+2", "[20]12", 0, "12345670+02", "" }, - /* 59*/ { BARCODE_UPCE_CC, -1, BARCODE_RAW_TEXT, "1234567+2", "[20]12", 0, "12345670+02", "012345600007002|2012" }, + /* 59*/ { BARCODE_UPCE_CC, -1, BARCODE_CONTENT_SEGS, "1234567+2", "[20]12", 0, "12345670+02", "012345600007002|2012" }, /* 60*/ { BARCODE_DBAR_STK_CC, -1, -1, "12345678901231", "[20]12", 0, "", "" }, /* No HRT for stacked symbologies */ - /* 61*/ { BARCODE_DBAR_STK_CC, -1, BARCODE_RAW_TEXT, "12345678901231", "[20]12", 0, "", "0112345678901231|2012" }, /* But have RAW_TEXT */ + /* 61*/ { BARCODE_DBAR_STK_CC, -1, BARCODE_CONTENT_SEGS, "12345678901231", "[20]12", 0, "", "0112345678901231|2012" }, /* But have content segs */ /* 62*/ { BARCODE_DBAR_OMNSTK_CC, -1, -1, "12345678901231", "[20]12", 0, "", "" }, - /* 63*/ { BARCODE_DBAR_OMNSTK_CC, -1, BARCODE_RAW_TEXT, "12345678901231", "[20]12", 0, "", "0112345678901231|2012" }, + /* 63*/ { BARCODE_DBAR_OMNSTK_CC, -1, BARCODE_CONTENT_SEGS, "12345678901231", "[20]12", 0, "", "0112345678901231|2012" }, }; const int data_size = ARRAY_SIZE(data); int i, length, composite_length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -3601,7 +3601,7 @@ static void test_hrt(const testCtx *const p_ctx) { strcpy(symbol->primary, data[i].data); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); composite_length = (int) strlen(data[i].composite); @@ -3612,18 +3612,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((const char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_dmatrix.c b/backend/tests/test_dmatrix.c index ca74ddd1..3ec3c850 100644 --- a/backend/tests/test_dmatrix.c +++ b/backend/tests/test_dmatrix.c @@ -6409,27 +6409,27 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_DATAMATRIX, UNICODE_MODE, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { BARCODE_DATAMATRIX, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { BARCODE_DATAMATRIX, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { BARCODE_DATAMATRIX, UNICODE_MODE, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 3*/ { BARCODE_DATAMATRIX, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 3*/ { BARCODE_DATAMATRIX, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 4*/ { BARCODE_DATAMATRIX, UNICODE_MODE | ESCAPE_MODE, -1, -1, "[)>\\R05\\GA\\R\\E", -1, 0, 0, "", -1, 0 }, - /* 5*/ { BARCODE_DATAMATRIX, UNICODE_MODE | ESCAPE_MODE, -1, BARCODE_RAW_TEXT, "[)>\\R05\\GA\\R\\E", -1, 0, 0, "[)>\03605\035A\036\004", -1, 3 }, /* Full content including Macro05 */ + /* 5*/ { BARCODE_DATAMATRIX, UNICODE_MODE | ESCAPE_MODE, -1, BARCODE_CONTENT_SEGS, "[)>\\R05\\GA\\R\\E", -1, 0, 0, "[)>\03605\035A\036\004", -1, 3 }, /* Full content including Macro05 */ /* 6*/ { BARCODE_DATAMATRIX, DATA_MODE, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 7*/ { BARCODE_DATAMATRIX, DATA_MODE, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 7*/ { BARCODE_DATAMATRIX, DATA_MODE, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 8*/ { BARCODE_DATAMATRIX, UNICODE_MODE, 26, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 9*/ { BARCODE_DATAMATRIX, UNICODE_MODE, 26, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 9*/ { BARCODE_DATAMATRIX, UNICODE_MODE, 26, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 10*/ { BARCODE_DATAMATRIX, UNICODE_MODE, 899, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 11*/ { BARCODE_DATAMATRIX, UNICODE_MODE, 899, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 11*/ { BARCODE_DATAMATRIX, UNICODE_MODE, 899, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, /* 12*/ { BARCODE_DATAMATRIX, GS1_MODE, -1, -1, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "", -1, 0 }, - /* 13*/ { BARCODE_DATAMATRIX, GS1_MODE, -1, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, - /* 14*/ { BARCODE_DATAMATRIX, GS1_MODE, 28, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 28, "01049123451234591597033130128\03510ABC123", -1, 3 }, /* Note: raw text ECI rremains at default 3 */ + /* 13*/ { BARCODE_DATAMATRIX, GS1_MODE, -1, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, + /* 14*/ { BARCODE_DATAMATRIX, GS1_MODE, 28, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 28, "01049123451234591597033130128\03510ABC123", -1, 3 }, /* Note: content seg ECI rremains at default 3 */ /* 15*/ { BARCODE_HIBC_DM, UNICODE_MODE, -1, -1, "H123ABC01234567890", -1, 0, 0, "", -1, 0 }, - /* 16*/ { BARCODE_HIBC_DM, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "H123ABC01234567890", -1, 0, 0, "+H123ABC01234567890D", -1, 3 }, + /* 16*/ { BARCODE_HIBC_DM, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "H123ABC01234567890", -1, 0, 0, "+H123ABC01234567890D", -1, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -6461,23 +6461,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -6498,17 +6498,17 @@ static void test_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 14, 14, {{0}}, 0 }, - /* 1*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 14, 14, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 14, 14, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 18, 18, {{0}}, 0 }, - /* 3*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 18, 18, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 3*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 18, 18, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 4*/ { DATA_MODE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 18, 18, {{0}}, 0 }, - /* 5*/ { DATA_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 18, 18, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 5*/ { DATA_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 18, 18, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -6542,31 +6542,31 @@ static void test_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_dotcode.c b/backend/tests/test_dotcode.c index cd8b60ce..baee9e1d 100644 --- a/backend/tests/test_dotcode.c +++ b/backend/tests/test_dotcode.c @@ -1612,25 +1612,25 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 3*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 3*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 4*/ { UNICODE_MODE | ESCAPE_MODE, -1, -1, "[)>\\R05\\GA\\R\\E", -1, 0, 0, "", -1, 0 }, - /* 5*/ { UNICODE_MODE | ESCAPE_MODE, -1, BARCODE_RAW_TEXT, "[)>\\R05\\GA\\R\\E", -1, 0, 0, "[)>\03605\035A\036\004", -1, 3 }, + /* 5*/ { UNICODE_MODE | ESCAPE_MODE, -1, BARCODE_CONTENT_SEGS, "[)>\\R05\\GA\\R\\E", -1, 0, 0, "[)>\03605\035A\036\004", -1, 3 }, /* 6*/ { DATA_MODE, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 7*/ { DATA_MODE, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 7*/ { DATA_MODE, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 8*/ { UNICODE_MODE, 26, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 9*/ { UNICODE_MODE, 26, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 9*/ { UNICODE_MODE, 26, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 10*/ { UNICODE_MODE, 899, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 11*/ { UNICODE_MODE, 899, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 11*/ { UNICODE_MODE, 899, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, /* 12*/ { GS1_MODE, -1, -1, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "", -1, 0 }, - /* 13*/ { GS1_MODE, -1, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, - /* 14*/ { GS1_MODE, 20, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, ZINT_WARN_NONCOMPLIANT, 20, "01049123451234591597033130128\03510ABC123", -1, 3 }, /* Note: raw text ECI remains at default 3 */ + /* 13*/ { GS1_MODE, -1, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, + /* 14*/ { GS1_MODE, 20, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, ZINT_WARN_NONCOMPLIANT, 20, "01049123451234591597033130128\03510ABC123", -1, 3 }, /* Note: content seg ECI remains at default 3 */ }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -1661,23 +1661,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -1698,17 +1698,17 @@ static void test_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 12, 19, {{0}}, 0 }, - /* 1*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 12, 19, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 12, 19, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 19, 28, {{0}}, 0 }, - /* 3*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 19, 28, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 3*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 19, 28, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 4*/ { DATA_MODE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 19, 28, {{0}}, 0 }, - /* 5*/ { DATA_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 19, 28, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 5*/ { DATA_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 19, 28, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -1742,31 +1742,31 @@ static void test_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_dxfilmedge.c b/backend/tests/test_dxfilmedge.c index 4a08cd4a..54576432 100644 --- a/backend/tests/test_dxfilmedge.c +++ b/backend/tests/test_dxfilmedge.c @@ -39,29 +39,29 @@ static void test_hrt(const testCtx *const p_ctx) { const char *data; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { -1, "79-7", "", "" }, /* None */ - /* 1*/ { BARCODE_RAW_TEXT, "79-7", "", "79-7" }, + /* 1*/ { BARCODE_CONTENT_SEGS, "79-7", "", "79-7" }, /* 2*/ { -1, "1271", "", "" }, /* None */ - /* 3*/ { BARCODE_RAW_TEXT, "1271", "", "79-7" }, + /* 3*/ { BARCODE_CONTENT_SEGS, "1271", "", "79-7" }, /* 4*/ { -1, "012710", "", "" }, /* None */ - /* 5*/ { BARCODE_RAW_TEXT, "012710", "", "79-7" }, + /* 5*/ { BARCODE_CONTENT_SEGS, "012710", "", "79-7" }, /* 6*/ { -1, "1-0", "", "" }, /* None */ - /* 7*/ { BARCODE_RAW_TEXT, "1-0", "", "1-0" }, + /* 7*/ { BARCODE_CONTENT_SEGS, "1-0", "", "1-0" }, /* 8*/ { -1, "2047/63A", "", "" }, /* None */ - /* 9*/ { BARCODE_RAW_TEXT, "2047/63A", "", "127-15/63A" }, + /* 9*/ { BARCODE_CONTENT_SEGS, "2047/63A", "", "127-15/63A" }, /* 10*/ { -1, "79-7/1", "", "" }, /* None */ - /* 11*/ { BARCODE_RAW_TEXT, "79-7/1", "", "79-7/1" }, + /* 11*/ { BARCODE_CONTENT_SEGS, "79-7/1", "", "79-7/1" }, /* 12*/ { -1, "79-7/sa", "", "" }, /* None */ - /* 13*/ { BARCODE_RAW_TEXT, "79-7/sa", "", "79-7/62A" }, + /* 13*/ { BARCODE_CONTENT_SEGS, "79-7/sa", "", "79-7/62A" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -76,7 +76,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -85,18 +85,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length, symbol->text); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_gridmtx.c b/backend/tests/test_gridmtx.c index da19f260..fb1adbbc 100644 --- a/backend/tests/test_gridmtx.c +++ b/backend/tests/test_gridmtx.c @@ -921,26 +921,26 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 29 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 29 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 3*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 3*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 4*/ { UNICODE_MODE, -1, -1, -1, "电", -1, 0, 0, "", -1, 0 }, - /* 5*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "电", -1, 0, 0, "电", -1, 29 }, + /* 5*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "电", -1, 0, 0, "电", -1, 29 }, /* 6*/ { DATA_MODE, -1, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 7*/ { DATA_MODE, -1, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 29 }, + /* 7*/ { DATA_MODE, -1, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 29 }, /* 8*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 9*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 29 }, + /* 9*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 29 }, /* 10*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, -1, "\265\347", -1, 0, 0, "", -1, 0 }, - /* 11*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, "\265\347", -1, 0, 0, "\265\347", -1, 29 }, + /* 11*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, "\265\347", -1, 0, 0, "\265\347", -1, 29 }, /* 12*/ { UNICODE_MODE, 26, -1, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 13*/ { UNICODE_MODE, 26, -1, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 13*/ { UNICODE_MODE, 26, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 14*/ { UNICODE_MODE, 899, -1, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 15*/ { UNICODE_MODE, 899, -1, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 15*/ { UNICODE_MODE, 899, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -971,23 +971,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -1008,23 +1008,23 @@ static void test_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, ZINT_WARN_USES_ECI, 30, 30, {{0}}, 0 }, - /* 1*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, ZINT_WARN_USES_ECI, 30, 30, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, ZINT_WARN_USES_ECI, 30, 30, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, { { TU("ก"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, ZINT_WARN_USES_ECI, 30, 30, {{0}}, 0 }, - /* 3*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("ก"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, ZINT_WARN_USES_ECI, 30, 30, { { TU("ก"), 3, 13 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, + /* 3*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("ก"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, ZINT_WARN_USES_ECI, 30, 30, { { TU("ก"), 3, 13 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* 4*/ { UNICODE_MODE, -1, { { TU("电"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 30, 30, {{0}}, 0 }, - /* 5*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("电"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 30, 30, { { TU("电"), 3, 29 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, + /* 5*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("电"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 30, 30, { { TU("电"), 3, 29 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* 6*/ { UNICODE_MODE, -1, { { TU("电电"), -1, 0 }, { TU("กขฯ"), -1, 13 }, { TU("βββ"), -1, 9 } }, 0, 30, 30, {{0}}, 0 }, - /* 7*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("电电"), -1, 0 }, { TU("กขฯ"), -1, 13 }, { TU("βββ"), -1, 9 } }, 0, 30, 30, { { TU("电电"), 6, 29 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 7*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("电电"), -1, 0 }, { TU("กขฯ"), -1, 13 }, { TU("βββ"), -1, 9 } }, 0, 30, 30, { { TU("电电"), 6, 29 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 8*/ { UNICODE_MODE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("点"), -1, 20 } }, 0, 30, 30, {{0}}, 0 }, - /* 9*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("点"), -1, 20 } }, 0, 30, 30, { { TU("¶"), 2, 26 }, { TU("Ж"), 2, 29 }, { TU("点"), 3, 20 } }, 3 }, + /* 9*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("点"), -1, 20 } }, 0, 30, 30, { { TU("¶"), 2, 26 }, { TU("Ж"), 2, 29 }, { TU("点"), 3, 20 } }, 3 }, /* 10*/ { DATA_MODE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 30, 30, {{0}}, 0 }, - /* 11*/ { DATA_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 30, 30, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 29 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 11*/ { DATA_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 30, 30, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 29 }, { TU("\223\137"), 2, 20 } }, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -1058,31 +1058,31 @@ static void test_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_gs1.c b/backend/tests/test_gs1.c index 0c84d47f..429bf8fa 100644 --- a/backend/tests/test_gs1.c +++ b/backend/tests/test_gs1.c @@ -357,131 +357,131 @@ static void test_hrt(const testCtx *const p_ctx) { int ret; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_GS1_128, -1, -1, "[01]12345678901234[20]12", "", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234(20)12", "" }, /* Incorrect check digit */ /* 1*/ { BARCODE_GS1_128, GS1NOCHECK_MODE, -1, "[01]12345678901234[20]12", "", 0, "(01)12345678901234(20)12", "" }, - /* 2*/ { BARCODE_GS1_128, -1, BARCODE_RAW_TEXT, "[01]12345678901234[20]12", "", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234(20)12", "01123456789012342012" }, + /* 2*/ { BARCODE_GS1_128, -1, BARCODE_CONTENT_SEGS, "[01]12345678901234[20]12", "", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234(20)12", "01123456789012342012" }, /* 3*/ { BARCODE_GS1_128, -1, -1, "[01]12345678901231[20]12", "", 0, "(01)12345678901231(20)12", "" }, /* 4*/ { BARCODE_GS1_128, -1, -1, "[01]12345678901231[10]12[20]AB", "", ZINT_WARN_NONCOMPLIANT, "(01)12345678901231(10)12(20)AB", "" }, /* AI (20) should be 2 nos. */ /* 5*/ { BARCODE_GS1_128, GS1NOCHECK_MODE, -1, "[01]12345678901231[10]10[20]AB", "", 0, "(01)12345678901231(10)10(20)AB", "" }, /* 6*/ { BARCODE_GS1_128, -1, -1, "[01]12345678901231[10]AB[20]12", "", 0, "(01)12345678901231(10)AB(20)12", "" }, /* 7*/ { BARCODE_GS1_128, -1, -1, "[91]ABCDEF]GH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDEF]GH", "" }, /* Invalid CSET 82 character */ /* 8*/ { BARCODE_GS1_128, GS1NOCHECK_MODE, -1, "[91]ABCDEF]GH", "", 0, "(91)ABCDEF]GH", "" }, - /* 9*/ { BARCODE_GS1_128, -1, BARCODE_RAW_TEXT, "[91]ABCDEF]GH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDEF]GH", "91ABCDEF]GH" }, + /* 9*/ { BARCODE_GS1_128, -1, BARCODE_CONTENT_SEGS, "[91]ABCDEF]GH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDEF]GH", "91ABCDEF]GH" }, /* 10*/ { BARCODE_GS1_128, -1, -1, "[91]ABCDEF)GH", "", 0, "(91)ABCDEF)GH", "" }, - /* 11*/ { BARCODE_GS1_128, -1, BARCODE_RAW_TEXT, "[91]ABCDEF)GH", "", 0, "(91)ABCDEF)GH", "91ABCDEF)GH" }, + /* 11*/ { BARCODE_GS1_128, -1, BARCODE_CONTENT_SEGS, "[91]ABCDEF)GH", "", 0, "(91)ABCDEF)GH", "91ABCDEF)GH" }, /* 12*/ { BARCODE_GS1_128, -1, -1, "[91]ABCDEF(GH", "", 0, "(91)ABCDEF(GH", "" }, - /* 13*/ { BARCODE_GS1_128, -1, BARCODE_RAW_TEXT, "[91]ABCDEF(GH", "", 0, "(91)ABCDEF(GH", "91ABCDEF(GH" }, + /* 13*/ { BARCODE_GS1_128, -1, BARCODE_CONTENT_SEGS, "[91]ABCDEF(GH", "", 0, "(91)ABCDEF(GH", "91ABCDEF(GH" }, /* 14*/ { BARCODE_GS1_128, -1, -1, "[91]ABCDE(20)12", "", 0, "(91)ABCDE(20)12", "" }, - /* 15*/ { BARCODE_GS1_128, -1, BARCODE_RAW_TEXT, "[91]ABCDE(20)12", "", 0, "(91)ABCDE(20)12", "91ABCDE(20)12" }, + /* 15*/ { BARCODE_GS1_128, -1, BARCODE_CONTENT_SEGS, "[91]ABCDE(20)12", "", 0, "(91)ABCDE(20)12", "91ABCDE(20)12" }, /* 16*/ { BARCODE_GS1_128, -1, -1, "[90]1234[91]ABCDE(20)12", "", 0, "(90)1234(91)ABCDE(20)12", "" }, - /* 17*/ { BARCODE_GS1_128, -1, BARCODE_RAW_TEXT, "[90]1234[91]ABCDE(20)12", "", 0, "(90)1234(91)ABCDE(20)12", "901234\03591ABCDE(20)12" }, + /* 17*/ { BARCODE_GS1_128, -1, BARCODE_CONTENT_SEGS, "[90]1234[91]ABCDE(20)12", "", 0, "(90)1234(91)ABCDE(20)12", "901234\03591ABCDE(20)12" }, /* 18*/ { BARCODE_GS1_128, -1, -1, "[90]1234[91]ABCDE(20)12[20]12", "", 0, "(90)1234(91)ABCDE(20)12(20)12", "" }, - /* 19*/ { BARCODE_GS1_128, -1, BARCODE_RAW_TEXT, "[90]1234[91]ABCDE(20)12[20]12", "", 0, "(90)1234(91)ABCDE(20)12(20)12", "901234\03591ABCDE(20)12\0352012" }, + /* 19*/ { BARCODE_GS1_128, -1, BARCODE_CONTENT_SEGS, "[90]1234[91]ABCDE(20)12[20]12", "", 0, "(90)1234(91)ABCDE(20)12(20)12", "901234\03591ABCDE(20)12\0352012" }, /* 20*/ { BARCODE_GS1_128, GS1PARENS_MODE, -1, "(91)ABCDEF]GH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDEF]GH", "" }, /* Invalid CSET 82 character */ /* 21*/ { BARCODE_GS1_128, GS1PARENS_MODE | GS1NOCHECK_MODE, -1, "(91)ABCDEF]GH", "", 0, "(91)ABCDEF]GH", "" }, - /* 22*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_RAW_TEXT, "(91)ABCDEF]GH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDEF]GH", "91ABCDEF]GH" }, + /* 22*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(91)ABCDEF]GH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDEF]GH", "91ABCDEF]GH" }, /* 23*/ { BARCODE_GS1_128, GS1PARENS_MODE, -1, "(91)ABCDEF)GH", "", 0, "(91)ABCDEF)GH", "" }, - /* 24*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_RAW_TEXT, "(91)ABCDEF)GH", "", 0, "(91)ABCDEF)GH", "91ABCDEF)GH" }, + /* 24*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(91)ABCDEF)GH", "", 0, "(91)ABCDEF)GH", "91ABCDEF)GH" }, /* 25*/ { BARCODE_GS1_128, GS1PARENS_MODE, -1, "(91)ABCDE[FGH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDE[FGH", "" }, /* Invalid CSET 82 character */ /* 26*/ { BARCODE_GS1_128, GS1PARENS_MODE | GS1NOCHECK_MODE, -1, "(91)ABCDE[FGH", "", 0, "(91)ABCDE[FGH", "" }, - /* 27*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_RAW_TEXT, "(91)ABCDE[FGH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDE[FGH", "91ABCDE[FGH" }, + /* 27*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(91)ABCDE[FGH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDE[FGH", "91ABCDE[FGH" }, /* 28*/ { BARCODE_GS1_128, GS1PARENS_MODE, -1, "(91)ABCDE[92]GH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDE[92]GH", "" }, /* Invalid CSET 82 character */ /* 29*/ { BARCODE_GS1_128, GS1PARENS_MODE | GS1NOCHECK_MODE, -1, "(91)ABCDE[92]GH", "", 0, "(91)ABCDE[92]GH", "" }, - /* 30*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_RAW_TEXT, "(91)ABCDE[92]GH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDE[92]GH", "91ABCDE[92]GH" }, + /* 30*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(91)ABCDE[92]GH", "", ZINT_WARN_NONCOMPLIANT, "(91)ABCDE[92]GH", "91ABCDE[92]GH" }, /* 31*/ { BARCODE_GS1_128_CC, -1, -1, "[01]12345678901234[20]12", "[21]12345", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234(20)12", "" }, /* Incorrect check digit */ /* 32*/ { BARCODE_GS1_128, -1, -1, "[91]ABCDEF)GH", "", 0, "(91)ABCDEF)GH", "" }, - /* 33*/ { BARCODE_GS1_128, -1, BARCODE_RAW_TEXT, "[91]ABCDEF)GH", "", 0, "(91)ABCDEF)GH", "91ABCDEF)GH" }, + /* 33*/ { BARCODE_GS1_128, -1, BARCODE_CONTENT_SEGS, "[91]ABCDEF)GH", "", 0, "(91)ABCDEF)GH", "91ABCDEF)GH" }, /* 34*/ { BARCODE_GS1_128, GS1PARENS_MODE, -1, "(91)ABCDEF\\)GH", "", 0, "(91)ABCDEF\\)GH", "" }, /* Escaped parens now work without ESCAPE_MODE & now kept in HRT */ /* 35*/ { BARCODE_GS1_128, ESCAPE_MODE | GS1PARENS_MODE, -1, "(91)ABCDEF\\)GH", "", 0, "(91)ABCDEF\\)GH", "" }, /* Escaped parens now kept in HRT */ - /* 36*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_RAW_TEXT, "(91)ABCDEF\\)GH", "", 0, "(91)ABCDEF\\)GH", "91ABCDEF)GH" }, - /* 37*/ { BARCODE_GS1_128, ESCAPE_MODE | GS1PARENS_MODE, BARCODE_RAW_TEXT, "(91)ABCDEF\\)GH", "", 0, "(91)ABCDEF\\)GH", "91ABCDEF)GH" }, + /* 36*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(91)ABCDEF\\)GH", "", 0, "(91)ABCDEF\\)GH", "91ABCDEF)GH" }, + /* 37*/ { BARCODE_GS1_128, ESCAPE_MODE | GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(91)ABCDEF\\)GH", "", 0, "(91)ABCDEF\\)GH", "91ABCDEF)GH" }, /* 38*/ { BARCODE_GS1_128, -1, -1, "[91]ABCDEF(GH", "", 0, "(91)ABCDEF(GH", "" }, - /* 39*/ { BARCODE_GS1_128, -1, BARCODE_RAW_TEXT, "[91]ABCDEF(GH", "", 0, "(91)ABCDEF(GH", "91ABCDEF(GH" }, + /* 39*/ { BARCODE_GS1_128, -1, BARCODE_CONTENT_SEGS, "[91]ABCDEF(GH", "", 0, "(91)ABCDEF(GH", "91ABCDEF(GH" }, /* 40*/ { BARCODE_GS1_128, GS1PARENS_MODE, -1, "(91)ABCDEF\\(GH", "", 0, "(91)ABCDEF\\(GH", "" }, /* 41*/ { BARCODE_GS1_128, ESCAPE_MODE | GS1PARENS_MODE, -1, "(91)ABCDEF\\(GH", "", 0, "(91)ABCDEF\\(GH", "" }, - /* 42*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_RAW_TEXT, "(91)ABCDEF\\(GH", "", 0, "(91)ABCDEF\\(GH", "91ABCDEF(GH" }, - /* 43*/ { BARCODE_GS1_128, ESCAPE_MODE | GS1PARENS_MODE, BARCODE_RAW_TEXT, "(91)ABCDEF\\(GH", "", 0, "(91)ABCDEF\\(GH", "91ABCDEF(GH" }, + /* 42*/ { BARCODE_GS1_128, GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(91)ABCDEF\\(GH", "", 0, "(91)ABCDEF\\(GH", "91ABCDEF(GH" }, + /* 43*/ { BARCODE_GS1_128, ESCAPE_MODE | GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(91)ABCDEF\\(GH", "", 0, "(91)ABCDEF\\(GH", "91ABCDEF(GH" }, /* 44*/ { BARCODE_GS1_128_CC, GS1NOCHECK_MODE, -1, "[01]12345678901234[20]12", "[21]12345", 0, "(01)12345678901234(20)12", "" }, - /* 45*/ { BARCODE_GS1_128_CC, -1, BARCODE_RAW_TEXT, "[01]12345678901234[20]12", "[21]12345", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234(20)12", "01123456789012342012|2112345" }, + /* 45*/ { BARCODE_GS1_128_CC, -1, BARCODE_CONTENT_SEGS, "[01]12345678901234[20]12", "[21]12345", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234(20)12", "01123456789012342012|2112345" }, /* 46*/ { BARCODE_GS1_128_CC, -1, -1, "[01]12345678901231[20]12", "[21]12345", 0, "(01)12345678901231(20)12", "" }, /* 47*/ { BARCODE_GS1_128_CC, -1, -1, "[01]12345678901231[10]12[20]AB", "[21]12345", ZINT_WARN_NONCOMPLIANT, "(01)12345678901231(10)12(20)AB", "" }, /* AI (20) should be 2 nos. */ /* 48*/ { BARCODE_GS1_128_CC, GS1NOCHECK_MODE, -1, "[01]12345678901231[10]12[20]AB", "[21]12345", 0, "(01)12345678901231(10)12(20)AB", "" }, /* 49*/ { BARCODE_GS1_128_CC, -1, -1, "[01]12345678901231[10]AB[20]12", "[21]12345", 0, "(01)12345678901231(10)AB(20)12", "" }, - /* 50*/ { BARCODE_GS1_128_CC, -1, BARCODE_RAW_TEXT, "[01]12345678901231[10]AB[20]12", "[21]12345", 0, "(01)12345678901231(10)AB(20)12", "011234567890123110AB\0352012|2112345" }, + /* 50*/ { BARCODE_GS1_128_CC, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[10]AB[20]12", "[21]12345", 0, "(01)12345678901231(10)AB(20)12", "011234567890123110AB\0352012|2112345" }, /* 51*/ { BARCODE_GS1_128_CC, -1, -1, "[01]12345678901231[10]AB[20]12", "[30]1234567A", ZINT_WARN_NONCOMPLIANT, "(01)12345678901231(10)AB(20)12", "" }, /* 52*/ { BARCODE_GS1_128_CC, GS1NOCHECK_MODE, -1, "[01]12345678901231[10]AB[20]12", "[30]1234567A", 0, "(01)12345678901231(10)AB(20)12", "" }, /* 53*/ { BARCODE_EAN14, -1, -1, "1234567890123", "", 0, "(01)12345678901231", "" }, - /* 54*/ { BARCODE_EAN14, -1, BARCODE_RAW_TEXT, "1234567890123", "", 0, "(01)12345678901231", "0112345678901231" }, + /* 54*/ { BARCODE_EAN14, -1, BARCODE_CONTENT_SEGS, "1234567890123", "", 0, "(01)12345678901231", "0112345678901231" }, /* 55*/ { BARCODE_EAN14, -1, -1, "1234", "", 0, "(01)00000000012348", "" }, - /* 56*/ { BARCODE_EAN14, -1, BARCODE_RAW_TEXT, "1234", "", 0, "(01)00000000012348", "0100000000012348" }, + /* 56*/ { BARCODE_EAN14, -1, BARCODE_CONTENT_SEGS, "1234", "", 0, "(01)00000000012348", "0100000000012348" }, /* 57*/ { BARCODE_EAN14, -1, -1, "12345", "", 0, "(01)00000000123457", "" }, /* 58*/ { BARCODE_EAN14, -1, -1, "12340", "", 0, "(01)00000000123402", "" }, /* 59*/ { BARCODE_NVE18, -1, -1, "12345678901234567", "", 0, "(00)123456789012345675", "" }, - /* 60*/ { BARCODE_NVE18, -1, BARCODE_RAW_TEXT, "12345678901234567", "", 0, "(00)123456789012345675", "00123456789012345675" }, + /* 60*/ { BARCODE_NVE18, -1, BARCODE_CONTENT_SEGS, "12345678901234567", "", 0, "(00)123456789012345675", "00123456789012345675" }, /* 61*/ { BARCODE_NVE18, -1, -1, "1234", "", 0, "(00)000000000000012348", "" }, - /* 62*/ { BARCODE_NVE18, -1, BARCODE_RAW_TEXT, "1234", "", 0, "(00)000000000000012348", "00000000000000012348" }, + /* 62*/ { BARCODE_NVE18, -1, BARCODE_CONTENT_SEGS, "1234", "", 0, "(00)000000000000012348", "00000000000000012348" }, /* 63*/ { BARCODE_NVE18, -1, -1, "12345", "", 0, "(00)000000000000123457", "" }, /* 64*/ { BARCODE_NVE18, -1, -1, "12340", "", 0, "(00)000000000000123402", "" }, /* 65*/ { BARCODE_DBAR_EXP, -1, -1, "[01]12345678901234[20]12", "", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234(20)12", "" }, /* Incorrect check digit */ /* 66*/ { BARCODE_DBAR_EXP, GS1NOCHECK_MODE, -1, "[01]12345678901234[20]12", "", 0, "(01)12345678901234(20)12", "" }, - /* 67*/ { BARCODE_DBAR_EXP, -1, BARCODE_RAW_TEXT, "[01]12345678901234[20]12", "", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234(20)12", "01123456789012342012" }, + /* 67*/ { BARCODE_DBAR_EXP, -1, BARCODE_CONTENT_SEGS, "[01]12345678901234[20]12", "", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234(20)12", "01123456789012342012" }, /* 68*/ { BARCODE_DBAR_EXP, -1, -1, "[01]12345678901231[20]12", "", 0, "(01)12345678901231(20)12", "" }, - /* 69*/ { BARCODE_DBAR_EXP, -1, BARCODE_RAW_TEXT, "[01]12345678901231[20]12", "", 0, "(01)12345678901231(20)12", "01123456789012312012" }, + /* 69*/ { BARCODE_DBAR_EXP, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[20]12", "", 0, "(01)12345678901231(20)12", "01123456789012312012" }, /* 70*/ { BARCODE_DBAR_EXP, -1, -1, "[01]12345678901231[10]12[20]AB", "", ZINT_WARN_NONCOMPLIANT, "(01)12345678901231(10)12(20)AB", "" }, /* AI (20) should be 2 nos. */ /* 71*/ { BARCODE_DBAR_EXP, GS1NOCHECK_MODE, -1, "[01]12345678901231[10]12[20]AB", "", 0, "(01)12345678901231(10)12(20)AB", "" }, - /* 72*/ { BARCODE_DBAR_EXP, -1, BARCODE_RAW_TEXT, "[01]12345678901231[10]12[20]AB", "", ZINT_WARN_NONCOMPLIANT, "(01)12345678901231(10)12(20)AB", "01123456789012311012\03520AB" }, + /* 72*/ { BARCODE_DBAR_EXP, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[10]12[20]AB", "", ZINT_WARN_NONCOMPLIANT, "(01)12345678901231(10)12(20)AB", "01123456789012311012\03520AB" }, /* 73*/ { BARCODE_DBAR_EXP, -1, -1, "[01]12345678901231[10]AB[20]12", "", 0, "(01)12345678901231(10)AB(20)12", "" }, - /* 74*/ { BARCODE_DBAR_EXP, -1, BARCODE_RAW_TEXT, "[01]12345678901231[10]AB[20]12", "", 0, "(01)12345678901231(10)AB(20)12", "011234567890123110AB\0352012" }, + /* 74*/ { BARCODE_DBAR_EXP, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[10]AB[20]12", "", 0, "(01)12345678901231(10)AB(20)12", "011234567890123110AB\0352012" }, /* 75*/ { BARCODE_DBAR_EXP, -1, -1, "[01]12345678901231[10]AB[20]12[90]ABC(2012", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC(2012", "" }, - /* 76*/ { BARCODE_DBAR_EXP, -1, BARCODE_RAW_TEXT, "[01]12345678901231[10]AB[20]12[90]ABC(2012", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC(2012", "011234567890123110AB\035201290ABC(2012" }, + /* 76*/ { BARCODE_DBAR_EXP, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[10]AB[20]12[90]ABC(2012", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC(2012", "011234567890123110AB\035201290ABC(2012" }, /* 77*/ { BARCODE_DBAR_EXP, -1, -1, "[01]12345678901231[10]AB[20]12[90]ABC20)12", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC20)12", "" }, - /* 78*/ { BARCODE_DBAR_EXP, -1, BARCODE_RAW_TEXT, "[01]12345678901231[10]AB[20]12[90]ABC20)12", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC20)12", "011234567890123110AB\035201290ABC20)12" }, + /* 78*/ { BARCODE_DBAR_EXP, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[10]AB[20]12[90]ABC20)12", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC20)12", "011234567890123110AB\035201290ABC20)12" }, /* 79*/ { BARCODE_DBAR_EXP, -1, -1, "[01]12345678901231[10]AB[20]12[90]ABC(20)12", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC(20)12", "" }, - /* 80*/ { BARCODE_DBAR_EXP, -1, BARCODE_RAW_TEXT, "[01]12345678901231[10]AB[20]12[90]ABC(20)12", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC(20)12", "011234567890123110AB\035201290ABC(20)12" }, + /* 80*/ { BARCODE_DBAR_EXP, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[10]AB[20]12[90]ABC(20)12", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC(20)12", "011234567890123110AB\035201290ABC(20)12" }, /* 81*/ { BARCODE_DBAR_EXP, -1, -1, "[01]12345678901231[10]AB[20]12[90]ABC(20)12[91]12(", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC(20)12(91)12(" , ""}, - /* 82*/ { BARCODE_DBAR_EXP, -1, BARCODE_RAW_TEXT, "[01]12345678901231[10]AB[20]12[90]ABC(20)12[91]12(", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC(20)12(91)12(" , "011234567890123110AB\035201290ABC(20)12\0359112(" }, + /* 82*/ { BARCODE_DBAR_EXP, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[10]AB[20]12[90]ABC(20)12[91]12(", "", 0, "(01)12345678901231(10)AB(20)12(90)ABC(20)12(91)12(" , "011234567890123110AB\035201290ABC(20)12\0359112(" }, /* 83*/ { BARCODE_DBAR_EXP_CC, -1, -1, "[01]12345678901234", "[21]12345", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234", "" }, /* 84*/ { BARCODE_DBAR_EXP_CC, GS1NOCHECK_MODE, -1, "[01]12345678901234", "[21]12345", 0, "(01)12345678901234", "" }, - /* 85*/ { BARCODE_DBAR_EXP_CC, -1, BARCODE_RAW_TEXT, "[01]12345678901234", "[21]12345", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234", "0112345678901234|2112345" }, + /* 85*/ { BARCODE_DBAR_EXP_CC, -1, BARCODE_CONTENT_SEGS, "[01]12345678901234", "[21]12345", ZINT_WARN_NONCOMPLIANT, "(01)12345678901234", "0112345678901234|2112345" }, /* 86*/ { BARCODE_DBAR_EXP_CC, -1, -1, "[01]12345678901231", "[21]12345", 0, "(01)12345678901231", "" }, /* 87*/ { BARCODE_DBAR_EXP_CC, -1, -1, "[01]12345678901231[20]12[21]12345", "[21]12345", 0, "(01)12345678901231(20)12(21)12345", "" }, - /* 88*/ { BARCODE_DBAR_EXP_CC, -1, BARCODE_RAW_TEXT, "[01]12345678901231[20]12[21]12345", "[21]12345", 0, "(01)12345678901231(20)12(21)12345", "011234567890123120122112345|2112345" }, + /* 88*/ { BARCODE_DBAR_EXP_CC, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[20]12[21]12345", "[21]12345", 0, "(01)12345678901231(20)12(21)12345", "011234567890123120122112345|2112345" }, /* 89*/ { BARCODE_DBAR_EXP_CC, -1, -1, "[01]12345678901231[10](", "[21]123()", 0, "(01)12345678901231(10)(", "" }, - /* 90*/ { BARCODE_DBAR_EXP_CC, -1, BARCODE_RAW_TEXT, "[01]12345678901231[10](", "[21]123()", 0, "(01)12345678901231(10)(", "011234567890123110(|21123()" }, + /* 90*/ { BARCODE_DBAR_EXP_CC, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[10](", "[21]123()", 0, "(01)12345678901231(10)(", "011234567890123110(|21123()" }, /* 91*/ { BARCODE_DBAR_EXP_CC, GS1PARENS_MODE, -1, "(01)12345678901231(10)\\(", "(21)123\\(\\)", 0, "(01)12345678901231(10)\\(", "" }, /* Escaped parens now work without ESCAPE_MODE & now kept in HRT */ /* 92*/ { BARCODE_DBAR_EXP_CC, ESCAPE_MODE | GS1PARENS_MODE, -1, "(01)12345678901231(10)\\(", "(21)123\\(\\)", 0, "(01)12345678901231(10)\\(", "" }, - /* 93*/ { BARCODE_DBAR_EXP_CC, GS1PARENS_MODE, BARCODE_RAW_TEXT, "(01)12345678901231(10)\\(", "(21)123\\(\\)", 0, "(01)12345678901231(10)\\(", "011234567890123110(|21123()" }, - /* 94*/ { BARCODE_DBAR_EXP_CC, ESCAPE_MODE | GS1PARENS_MODE, BARCODE_RAW_TEXT, "(01)12345678901231(10)\\(", "(21)123\\(\\)", 0, "(01)12345678901231(10)\\(", "011234567890123110(|21123()" }, + /* 93*/ { BARCODE_DBAR_EXP_CC, GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(01)12345678901231(10)\\(", "(21)123\\(\\)", 0, "(01)12345678901231(10)\\(", "011234567890123110(|21123()" }, + /* 94*/ { BARCODE_DBAR_EXP_CC, ESCAPE_MODE | GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(01)12345678901231(10)\\(", "(21)123\\(\\)", 0, "(01)12345678901231(10)\\(", "011234567890123110(|21123()" }, /* 95*/ { BARCODE_DBAR_EXPSTK, -1, -1, "[01]12345678901234[20]12", "", ZINT_WARN_NONCOMPLIANT, "", "" }, /* 96*/ { BARCODE_DBAR_EXPSTK, GS1NOCHECK_MODE, -1, "[01]12345678901234[20]12", "", 0, "", "" }, - /* 97*/ { BARCODE_DBAR_EXPSTK, -1, BARCODE_RAW_TEXT, "[01]12345678901234[20]12", "", ZINT_WARN_NONCOMPLIANT, "", "01123456789012342012" }, + /* 97*/ { BARCODE_DBAR_EXPSTK, -1, BARCODE_CONTENT_SEGS, "[01]12345678901234[20]12", "", ZINT_WARN_NONCOMPLIANT, "", "01123456789012342012" }, /* 98*/ { BARCODE_DBAR_EXPSTK, -1, -1, "[01]12345678901231[20]12", "", 0, "", "" }, /* 99*/ { BARCODE_DBAR_EXPSTK, -1, -1, "[01]12345678901231[10]AB[20]12[90]ABC20)12", "", 0, "", "" }, - /*100*/ { BARCODE_DBAR_EXPSTK, -1, BARCODE_RAW_TEXT, "[01]12345678901231[10]AB[20]12[90]ABC20)12", "", 0, "", "011234567890123110AB\035201290ABC20)12" }, + /*100*/ { BARCODE_DBAR_EXPSTK, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[10]AB[20]12[90]ABC20)12", "", 0, "", "011234567890123110AB\035201290ABC20)12" }, /*101*/ { BARCODE_DBAR_EXPSTK, GS1PARENS_MODE, -1, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "", 0, "", "" }, /*102*/ { BARCODE_DBAR_EXPSTK, ESCAPE_MODE | GS1PARENS_MODE, -1, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "", 0, "", "" }, - /*103*/ { BARCODE_DBAR_EXPSTK, GS1PARENS_MODE, BARCODE_RAW_TEXT, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "", 0, "", "011234567890123110AB\035201290ABC20)12" }, - /*104*/ { BARCODE_DBAR_EXPSTK, ESCAPE_MODE | GS1PARENS_MODE, BARCODE_RAW_TEXT, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "", 0, "", "011234567890123110AB\035201290ABC20)12" }, + /*103*/ { BARCODE_DBAR_EXPSTK, GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "", 0, "", "011234567890123110AB\035201290ABC20)12" }, + /*104*/ { BARCODE_DBAR_EXPSTK, ESCAPE_MODE | GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "", 0, "", "011234567890123110AB\035201290ABC20)12" }, /*105*/ { BARCODE_DBAR_EXPSTK_CC, -1, -1, "[01]12345678901234[20]12", "[21]12345", ZINT_WARN_NONCOMPLIANT, "" , ""}, /*106*/ { BARCODE_DBAR_EXPSTK_CC, GS1NOCHECK_MODE, -1, "[01]12345678901234[20]12", "[21]12345", 0, "", "" }, - /*107*/ { BARCODE_DBAR_EXPSTK_CC, -1, BARCODE_RAW_TEXT, "[01]12345678901234[20]12", "[21]12345", ZINT_WARN_NONCOMPLIANT, "", "01123456789012342012|2112345" }, + /*107*/ { BARCODE_DBAR_EXPSTK_CC, -1, BARCODE_CONTENT_SEGS, "[01]12345678901234[20]12", "[21]12345", ZINT_WARN_NONCOMPLIANT, "", "01123456789012342012|2112345" }, /*108*/ { BARCODE_DBAR_EXPSTK_CC, -1, -1, "[01]12345678901231[20]12", "[21]12345", 0, "", "" }, /*109*/ { BARCODE_DBAR_EXPSTK_CC, -1, -1, "[01]12345678901231[10]AB[20]12[90]ABC20)12", "[21]12345", 0, "", "" }, - /*110*/ { BARCODE_DBAR_EXPSTK_CC, -1, BARCODE_RAW_TEXT, "[01]12345678901231[10]AB[20]12[90]ABC20)12", "[21]12345", 0, "", "011234567890123110AB\035201290ABC20)12|2112345" }, + /*110*/ { BARCODE_DBAR_EXPSTK_CC, -1, BARCODE_CONTENT_SEGS, "[01]12345678901231[10]AB[20]12[90]ABC20)12", "[21]12345", 0, "", "011234567890123110AB\035201290ABC20)12|2112345" }, /*111*/ { BARCODE_DBAR_EXPSTK_CC, GS1PARENS_MODE, -1, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "(21)12345", 0, "", "" }, /*112*/ { BARCODE_DBAR_EXPSTK_CC, ESCAPE_MODE | GS1PARENS_MODE, -1, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "(21)12345", 0, "", "" }, /*113*/ { BARCODE_DBAR_EXPSTK_CC, GS1PARENS_MODE, -1, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "(21)12345", 0, "", "" }, - /*114*/ { BARCODE_DBAR_EXPSTK_CC, ESCAPE_MODE | GS1PARENS_MODE, BARCODE_RAW_TEXT, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "(21)12345", 0, "", "011234567890123110AB\035201290ABC20)12|2112345" }, - /*115*/ { BARCODE_DBAR_EXPSTK_CC, GS1PARENS_MODE, BARCODE_RAW_TEXT, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "(21)12345", 0, "", "011234567890123110AB\035201290ABC20)12|2112345" }, + /*114*/ { BARCODE_DBAR_EXPSTK_CC, ESCAPE_MODE | GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "(21)12345", 0, "", "011234567890123110AB\035201290ABC20)12|2112345" }, + /*115*/ { BARCODE_DBAR_EXPSTK_CC, GS1PARENS_MODE, BARCODE_CONTENT_SEGS, "(01)12345678901231(10)AB(20)12(90)ABC20\\)12", "(21)12345", 0, "", "011234567890123110AB\035201290ABC20)12|2112345" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; const char *text; @@ -504,7 +504,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, data[i].output_options, text, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(text), length); assert_equal(ret, data[i].ret, "i:%d ZBarcode_Encode ret %d != %d (%s)\n", @@ -514,18 +514,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_gs1se.c b/backend/tests/test_gs1se.c index 6c185322..535558d9 100644 --- a/backend/tests/test_gs1se.c +++ b/backend/tests/test_gs1se.c @@ -331,22 +331,22 @@ static void test_hrt(const testCtx *const p_ctx) { int ret; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_EAN8_CC, -1, -1, "1234567", "[20]12", 0, "12345670", "" }, /* 1*/ { BARCODE_EANX_CC, -1, -1, "1234567", "[20]12", 0, "12345670", "" }, /* EAN-8 */ - /* 2*/ { BARCODE_EAN8_CC, -1, BARCODE_RAW_TEXT, "1234567", "[20]12", 0, "12345670", "12345670|2012" }, - /* 3*/ { BARCODE_EANX_CC, -1, BARCODE_RAW_TEXT, "1234567", "[20]12", 0, "12345670", "12345670|2012" }, + /* 2*/ { BARCODE_EAN8_CC, -1, BARCODE_CONTENT_SEGS, "1234567", "[20]12", 0, "12345670", "12345670|2012" }, + /* 3*/ { BARCODE_EANX_CC, -1, BARCODE_CONTENT_SEGS, "1234567", "[20]12", 0, "12345670", "12345670|2012" }, /* 4*/ { BARCODE_EAN13_CC, -1, -1, "123456789012", "[20]12", 0, "1234567890128", "" }, /* 5*/ { BARCODE_EANX_CC, -1, -1, "123456789012", "[20]12", 0, "1234567890128", "" }, /* EAN-13 */ - /* 6*/ { BARCODE_EAN13_CC, -1, BARCODE_RAW_TEXT, "123456789012", "[20]12", 0, "1234567890128", "1234567890128|2012" }, - /* 7*/ { BARCODE_EANX_CC, -1, BARCODE_RAW_TEXT, "123456789012", "[20]12", 0, "1234567890128", "1234567890128|2012" }, /* EAN-13 */ + /* 6*/ { BARCODE_EAN13_CC, -1, BARCODE_CONTENT_SEGS, "123456789012", "[20]12", 0, "1234567890128", "1234567890128|2012" }, + /* 7*/ { BARCODE_EANX_CC, -1, BARCODE_CONTENT_SEGS, "123456789012", "[20]12", 0, "1234567890128", "1234567890128|2012" }, /* EAN-13 */ /* 8*/ { BARCODE_EAN13_CC, -1, -1, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "" }, /* 9*/ { BARCODE_EANX_CC, -1, -1, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "" }, /* EAN-13 */ - /* 10*/ { BARCODE_EAN13_CC, -1, BARCODE_RAW_TEXT, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "1234567890128|10LOT123\0352012" }, - /* 11*/ { BARCODE_EANX_CC, -1, BARCODE_RAW_TEXT, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "1234567890128|10LOT123\0352012" }, /* EAN-13 */ + /* 10*/ { BARCODE_EAN13_CC, -1, BARCODE_CONTENT_SEGS, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "1234567890128|10LOT123\0352012" }, + /* 11*/ { BARCODE_EANX_CC, -1, BARCODE_CONTENT_SEGS, "123456789012", "[10]LOT123[20]12", 0, "1234567890128", "1234567890128|10LOT123\0352012" }, /* EAN-13 */ /* 12*/ { BARCODE_EAN13_CC, -1, -1, "1234567890128", "[20]12", 0, "1234567890128", "" }, /* 13*/ { BARCODE_EANX_CC, -1, -1, "1234567890128", "[20]12", 0, "1234567890128", "" }, /* 14*/ { BARCODE_EAN13_CC, -1, -1, "1234567890123", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, @@ -359,33 +359,33 @@ static void test_hrt(const testCtx *const p_ctx) { /* 21*/ { BARCODE_EANX_CC, GS1NOCHECK_MODE, -1, "1234567890128", "[20]1A", 0, "1234567890128", "" }, /* 22*/ { BARCODE_EAN13_CC, -1, -1, "1234567890128+12", "[20]12", 0, "1234567890128+12", "" }, /* 23*/ { BARCODE_EANX_CC, -1, -1, "1234567890128+12", "[20]12", 0, "1234567890128+12", "" }, - /* 24*/ { BARCODE_EAN13_CC, -1, BARCODE_RAW_TEXT, "1234567890128+12", "[20]12", 0, "1234567890128+12", "123456789012812|2012" }, - /* 25*/ { BARCODE_EANX_CC, -1, BARCODE_RAW_TEXT, "1234567890128+12", "[20]12", 0, "1234567890128+12", "123456789012812|2012" }, + /* 24*/ { BARCODE_EAN13_CC, -1, BARCODE_CONTENT_SEGS, "1234567890128+12", "[20]12", 0, "1234567890128+12", "123456789012812|2012" }, + /* 25*/ { BARCODE_EANX_CC, -1, BARCODE_CONTENT_SEGS, "1234567890128+12", "[20]12", 0, "1234567890128+12", "123456789012812|2012" }, /* 26*/ { BARCODE_DBAR_OMN_CC, -1, -1, "1234567890123", "[20]12", 0, "(01)12345678901231", "" }, - /* 27*/ { BARCODE_DBAR_OMN_CC, -1, BARCODE_RAW_TEXT, "1234567890123", "[20]12", 0, "(01)12345678901231", "0112345678901231|2012" }, + /* 27*/ { BARCODE_DBAR_OMN_CC, -1, BARCODE_CONTENT_SEGS, "1234567890123", "[20]12", 0, "(01)12345678901231", "0112345678901231|2012" }, /* 28*/ { BARCODE_DBAR_OMN_CC, -1, -1, "12345678901231", "[20]12", 0, "(01)12345678901231", "" }, /* 29*/ { BARCODE_DBAR_OMN_CC, -1, -1, "12345678901232", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* 30*/ { BARCODE_DBAR_OMN_CC, GS1NOCHECK_MODE, -1, "12345678901232", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* Still checked */ /* 31*/ { BARCODE_DBAR_OMN_CC, -1, -1, "12345678901231", "[20]1A", ZINT_ERROR_INVALID_DATA, "", "" }, /* AI (20) should be 2 nos. */ /* 32*/ { BARCODE_DBAR_OMN_CC, GS1NOCHECK_MODE, -1, "12345678901231", "[20]1A", 0, "(01)12345678901231", "" }, /* 33*/ { BARCODE_DBAR_LTD_CC, -1, -1, "1234567890123", "[20]12", 0, "(01)12345678901231", "" }, - /* 34*/ { BARCODE_DBAR_LTD_CC, -1, BARCODE_RAW_TEXT, "1234567890123", "[20]12", 0, "(01)12345678901231", "0112345678901231|2012" }, + /* 34*/ { BARCODE_DBAR_LTD_CC, -1, BARCODE_CONTENT_SEGS, "1234567890123", "[20]12", 0, "(01)12345678901231", "0112345678901231|2012" }, /* 35*/ { BARCODE_DBAR_LTD_CC, -1, -1, "12345678901231", "[20]12", 0, "(01)12345678901231", "" }, /* 36*/ { BARCODE_DBAR_LTD_CC, -1, -1, "12345678901232", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* 37*/ { BARCODE_DBAR_LTD_CC, GS1NOCHECK_MODE, -1, "12345678901232", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* Still checked */ /* 38*/ { BARCODE_DBAR_LTD_CC, -1, -1, "12345678901231", "[20]1A", ZINT_ERROR_INVALID_DATA, "", "" }, /* AI (20) should be 2 nos. */ /* 39*/ { BARCODE_DBAR_LTD_CC, GS1NOCHECK_MODE, -1, "12345678901231", "[20]1A", 0, "(01)12345678901231", "" }, /* 40*/ { BARCODE_UPCA_CC, -1, -1, "12345678901", "[20]12", 0, "123456789012", "" }, - /* 41*/ { BARCODE_UPCA_CC, -1, BARCODE_RAW_TEXT, "12345678901", "[20]12", 0, "123456789012", "0123456789012|2012" }, + /* 41*/ { BARCODE_UPCA_CC, -1, BARCODE_CONTENT_SEGS, "12345678901", "[20]12", 0, "123456789012", "0123456789012|2012" }, /* 42*/ { BARCODE_UPCA_CC, -1, -1, "123456789012", "[20]12", 0, "123456789012", "" }, /* 43*/ { BARCODE_UPCA_CC, -1, -1, "123456789013", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* 44*/ { BARCODE_UPCA_CC, GS1NOCHECK_MODE, -1, "123456789013", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, /* Still checked */ /* 45*/ { BARCODE_UPCA_CC, -1, -1, "123456789012", "[20]1A", ZINT_ERROR_INVALID_DATA, "", "" }, /* AI (20) should be 2 nos. */ /* 46*/ { BARCODE_UPCA_CC, GS1NOCHECK_MODE, -1, "123456789012", "[20]1A", 0, "123456789012", "" }, /* 47*/ { BARCODE_UPCA_CC, -1, -1, "123456789012+123", "[20]12", 0, "123456789012+00123", "" }, - /* 48*/ { BARCODE_UPCA_CC, -1, BARCODE_RAW_TEXT, "123456789012+123", "[20]12", 0, "123456789012+00123", "012345678901200123|2012" }, + /* 48*/ { BARCODE_UPCA_CC, -1, BARCODE_CONTENT_SEGS, "123456789012+123", "[20]12", 0, "123456789012+00123", "012345678901200123|2012" }, /* 49*/ { BARCODE_UPCE_CC, -1, -1, "123456", "[20]12", 0, "01234565", "" }, - /* 50*/ { BARCODE_UPCE_CC, -1, BARCODE_RAW_TEXT, "123456", "[20]12", 0, "01234565", "0012345000065|2012" }, + /* 50*/ { BARCODE_UPCE_CC, -1, BARCODE_CONTENT_SEGS, "123456", "[20]12", 0, "01234565", "0012345000065|2012" }, /* 51*/ { BARCODE_UPCE_CC, -1, -1, "1234567", "[20]12", 0, "12345670", "" }, /* 52*/ { BARCODE_UPCE_CC, -1, -1, "12345670", "[20]12", 0, "12345670", "" }, /* 53*/ { BARCODE_UPCE_CC, -1, -1, "12345671", "[20]12", ZINT_ERROR_INVALID_CHECK, "", "" }, @@ -393,16 +393,16 @@ static void test_hrt(const testCtx *const p_ctx) { /* 55*/ { BARCODE_UPCE_CC, -1, -1, "12345670", "[20]12", 0, "12345670", "" }, /* Check digit can now be given for UPCE_CC, like UPCA_CC */ /* 56*/ { BARCODE_UPCE_CC, -1, -1, "1234567", "[20]1A", ZINT_ERROR_INVALID_DATA, "", "" }, /* AI (20) should be 2 nos. */ /* 57*/ { BARCODE_UPCE_CC, GS1NOCHECK_MODE, -1, "1234567", "[20]1A", 0, "12345670", "" }, - /* 58*/ { BARCODE_UPCE_CC, -1, BARCODE_RAW_TEXT, "1234567+2", "[20]12", 0, "12345670+02", "012345600007002|2012" }, + /* 58*/ { BARCODE_UPCE_CC, -1, BARCODE_CONTENT_SEGS, "1234567+2", "[20]12", 0, "12345670+02", "012345600007002|2012" }, /* 59*/ { BARCODE_DBAR_STK_CC, -1, -1, "12345678901231", "[20]12", 0, "", "" }, /* No HRT for stacked symbologies */ - /* 60*/ { BARCODE_DBAR_STK_CC, -1, BARCODE_RAW_TEXT, "12345678901231", "[20]12", 0, "", "0112345678901231|2012" }, /* But have RAW_TEXT */ + /* 60*/ { BARCODE_DBAR_STK_CC, -1, BARCODE_CONTENT_SEGS, "12345678901231", "[20]12", 0, "", "0112345678901231|2012" }, /* But have content segs */ /* 61*/ { BARCODE_DBAR_OMNSTK_CC, -1, -1, "12345678901231", "[20]12", 0, "", "" }, - /* 62*/ { BARCODE_DBAR_OMNSTK_CC, -1, BARCODE_RAW_TEXT, "12345678901231", "[20]12", 0, "", "0112345678901231|2012" }, + /* 62*/ { BARCODE_DBAR_OMNSTK_CC, -1, BARCODE_CONTENT_SEGS, "12345678901231", "[20]12", 0, "", "0112345678901231|2012" }, }; const int data_size = ARRAY_SIZE(data); int i, length, composite_length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -421,7 +421,7 @@ static void test_hrt(const testCtx *const p_ctx) { strcpy(symbol->primary, data[i].data); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); composite_length = (int) strlen(data[i].composite); @@ -432,18 +432,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((const char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_hanxin.c b/backend/tests/test_hanxin.c index 0ea1b036..eb274c2e 100644 --- a/backend/tests/test_hanxin.c +++ b/backend/tests/test_hanxin.c @@ -3623,25 +3623,25 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, -1, "ก", -1, ZINT_WARN_NONCOMPLIANT, 0, "", -1, 0 }, - /* 3*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_NONCOMPLIANT, 0, "ก", -1, 32 }, /* When single segment will try ECI 32 as secondary default */ + /* 3*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_NONCOMPLIANT, 0, "ก", -1, 32 }, /* When single segment will try ECI 32 as secondary default */ /* 4*/ { UNICODE_MODE, -1, -1, -1, "啊", -1, ZINT_WARN_NONCOMPLIANT, 0, "", -1, 0 }, - /* 5*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "啊", -1, ZINT_WARN_NONCOMPLIANT, 0, "啊", -1, 32 }, + /* 5*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "啊", -1, ZINT_WARN_NONCOMPLIANT, 0, "啊", -1, 32 }, /* 6*/ { UNICODE_MODE, -1, -1, -1, "\302\200", -1, ZINT_WARN_NONCOMPLIANT, 0, "", -1, 0 }, - /* 7*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "\302\200", -1, ZINT_WARN_NONCOMPLIANT, 0, "\302\200", -1, 32 }, + /* 7*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "\302\200", -1, ZINT_WARN_NONCOMPLIANT, 0, "\302\200", -1, 32 }, /* 8*/ { DATA_MODE, -1, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 9*/ { DATA_MODE, -1, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 9*/ { DATA_MODE, -1, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 10*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, -1, "\223\137", -1, 0, 0, "", -1, 0 }, - /* 11*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, "\223\137", -1, 0, 0, "\223\137", -1, 3 }, /* Note "wrong" raw ECI, needs to be specified */ + /* 11*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, "\223\137", -1, 0, 0, "\223\137", -1, 3 }, /* Note "wrong" raw ECI, needs to be specified */ /* 12*/ { UNICODE_MODE, 26, -1, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 13*/ { UNICODE_MODE, 26, -1, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 13*/ { UNICODE_MODE, 26, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 14*/ { UNICODE_MODE, 899, -1, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 15*/ { UNICODE_MODE, 899, -1, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 15*/ { UNICODE_MODE, 899, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -3673,23 +3673,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -3711,23 +3711,23 @@ static void test_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 23, 23, {{0}}, 0 }, - /* 1*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 23, 23, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 23, 23, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, { { TU("ก"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, ZINT_WARN_USES_ECI, 23, 23, {{0}}, 0 }, - /* 3*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("ก"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, ZINT_WARN_USES_ECI, 23, 23, { { TU("ก"), 3, 13 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* When multiple segments, ECI 32 is not used as secondary default, so fails and retries with `get_best_eci()` */ + /* 3*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("ก"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, ZINT_WARN_USES_ECI, 23, 23, { { TU("ก"), 3, 13 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* When multiple segments, ECI 32 is not used as secondary default, so fails and retries with `get_best_eci()` */ /* 4*/ { UNICODE_MODE, -1, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 23, 23, {{0}}, 0 }, - /* 5*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 23, 23, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 5*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 23, 23, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 6*/ { UNICODE_MODE, -1, -1, { { TU("啊啊"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 25, 25, {{0}}, 0 }, - /* 7*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("啊啊"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 25, 25, { { TU("啊啊"), 6, 26 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* Note chooses 26 (UTF-8) for 啊 as multiple segments */ + /* 7*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("啊啊"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 25, 25, { { TU("啊啊"), 6, 26 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* Note chooses 26 (UTF-8) for 啊 as multiple segments */ /* 8*/ { DATA_MODE, -1, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\260\241"), -1, 32 } }, 0, 23, 23, {{0}}, 0 }, - /* 9*/ { DATA_MODE, -1, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\260\241"), -1, 32 } }, 0, 23, 23, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\260\241"), 2, 32 } }, 3 }, + /* 9*/ { DATA_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\260\241"), -1, 32 } }, 0, 23, 23, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\260\241"), 2, 32 } }, 3 }, /* 10*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\260\241"), -1, 32 } }, 0, 23, 23, {{0}}, 0 }, - /* 11*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\260\241"), -1, 32 } }, 0, 23, 23, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\260\241"), 2, 32 } }, 3 }, + /* 11*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\260\241"), -1, 32 } }, 0, 23, 23, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\260\241"), 2, 32 } }, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -3761,31 +3761,31 @@ static void test_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_imail.c b/backend/tests/test_imail.c index 38a4a79a..916b2dbd 100644 --- a/backend/tests/test_imail.c +++ b/backend/tests/test_imail.c @@ -170,17 +170,17 @@ static void test_hrt(const testCtx *const p_ctx) { int output_options; const char *data; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { -1, "53379777234994544928-51135759461", "", "" }, /* None */ - /* 1*/ { BARCODE_RAW_TEXT, "53379777234994544928-51135759461", "", "53379777234994544928-51135759461" }, + /* 1*/ { BARCODE_CONTENT_SEGS, "53379777234994544928-51135759461", "", "53379777234994544928-51135759461" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -195,7 +195,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -204,18 +204,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_library.c b/backend/tests/test_library.c index b8021635..6ea3bcfd 100644 --- a/backend/tests/test_library.c +++ b/backend/tests/test_library.c @@ -1861,7 +1861,7 @@ static void test_stacking(const testCtx *const p_ctx) { struct zint_symbol *symbol = NULL; const char *data = "1"; const char *expected_error = "Error 770: Too many stacked symbols"; - const char *expected_error_raw = "Error 857: Cannot use BARCODE_RAW_TEXT output option if stacking symbols"; + const char *expected_error_content = "Error 857: Cannot use BARCODE_CONTENT_SEGS output option if stacking symbols"; int i; (void)p_ctx; @@ -1886,12 +1886,12 @@ static void test_stacking(const testCtx *const p_ctx) { ret = ZBarcode_Encode(symbol, TCU(data), 0); assert_zero(ret, "i:%d ZBarcode_Encode(%s) ret %d != 0 (%s)\n", i, data, ret, symbol->errtxt); - symbol->output_options |= BARCODE_RAW_TEXT; + symbol->output_options |= BARCODE_CONTENT_SEGS; ret = ZBarcode_Encode(symbol, TCU(data), 0); assert_equal(ret, ZINT_ERROR_INVALID_OPTION, "i:%d ZBarcode_Encode ret %d != ZINT_ERROR_INVALID_OPTION (%s)\n", i, ret, symbol->errtxt); - assert_zero(strcmp(symbol->errtxt, expected_error_raw), "i:%d strcmp(%s, %s) != 0\n", - i, symbol->errtxt, expected_error_raw); + assert_zero(strcmp(symbol->errtxt, expected_error_content), "i:%d strcmp(%s, %s) != 0\n", + i, symbol->errtxt, expected_error_content); ZBarcode_Delete(symbol); @@ -2848,7 +2848,7 @@ static void test_utf8_to_eci(const testCtx *const p_ctx) { testFinish(); } -static void test_raw_text(const testCtx *const p_ctx) { +static void test_content_segs(const testCtx *const p_ctx) { int debug = p_ctx->debug; struct item { @@ -3000,7 +3000,7 @@ static void test_raw_text(const testCtx *const p_ctx) { text = data[i].data; } length = testUtilSetSymbol(symbol, data[i].symbology, data[i].input_mode, -1 /*eci*/, - -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, BARCODE_RAW_TEXT, + -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, BARCODE_CONTENT_SEGS, text, -1, debug); expected = data[i].expected[0] ? data[i].expected : data[i].data; expected_length = (int) strlen(expected); @@ -3008,15 +3008,15 @@ static void test_raw_text(const testCtx *const p_ctx) { ret = ZBarcode_Encode(symbol, TCU(text), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d (%.*s) != expected_length %d (%s)\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].length, symbol->raw_segs[0].source, + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d (%.*s) != expected_length %d (%s)\n", + i, symbol->content_segs[0].length, symbol->content_segs[0].length, symbol->content_segs[0].source, expected_length, expected); - assert_zero(memcmp(symbol->raw_segs[0].source, expected, expected_length), + assert_zero(memcmp(symbol->content_segs[0].source, expected, expected_length), "i:%d memcmp(%.*s, %.*s, %d) != 0\n", - i, expected_length, symbol->raw_segs[0].source, expected_length, expected, expected_length); + i, expected_length, symbol->content_segs[0].source, expected_length, expected, expected_length); ZBarcode_Delete(symbol); } @@ -3056,7 +3056,7 @@ int main(int argc, char *argv[]) { { "test_scale_from_xdimdp", test_scale_from_xdimdp }, { "test_xdimdp_from_scale", test_xdimdp_from_scale }, { "test_utf8_to_eci", test_utf8_to_eci }, - { "test_raw_text", test_raw_text }, + { "test_content_segs", test_content_segs }, }; testRun(argc, argv, funcs, ARRAY_SIZE(funcs)); diff --git a/backend/tests/test_mailmark.c b/backend/tests/test_mailmark.c index 7bb83a3b..f75be13b 100644 --- a/backend/tests/test_mailmark.c +++ b/backend/tests/test_mailmark.c @@ -39,25 +39,25 @@ static void test_4s_hrt(const testCtx *const p_ctx) { const char *data; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { -1, "1100000000000XY11", "", "" }, /* None */ - /* 1*/ { BARCODE_RAW_TEXT, "1100000000000XY11", "", "1100000000000XY11 " }, + /* 1*/ { BARCODE_CONTENT_SEGS, "1100000000000XY11", "", "1100000000000XY11 " }, /* 2*/ { -1, "1100000000000XY11 ", "", "" }, /* None */ - /* 3*/ { BARCODE_RAW_TEXT, "1100000000000XY11 ", "", "1100000000000XY11 " }, + /* 3*/ { BARCODE_CONTENT_SEGS, "1100000000000XY11 ", "", "1100000000000XY11 " }, /* 4*/ { -1, "0100000000000A00AA0A", "", "" }, /* None */ - /* 5*/ { BARCODE_RAW_TEXT, "0100000000000A00AA0A", "", "0100000000000A00AA0A " }, /* None */ + /* 5*/ { BARCODE_CONTENT_SEGS, "0100000000000A00AA0A", "", "0100000000000A00AA0A " }, /* None */ /* 6*/ { -1, "41038422416563762XY11 ", "", "" }, /* None */ - /* 7*/ { BARCODE_RAW_TEXT, "41038422416563762XY11 ", "", "41038422416563762XY11 " }, + /* 7*/ { BARCODE_CONTENT_SEGS, "41038422416563762XY11 ", "", "41038422416563762XY11 " }, /* 8*/ { -1, "01000000000000000AA000AA0A", "", "" }, /* None */ - /* 9*/ { BARCODE_RAW_TEXT, "01000000000000000AA000AA0A", "", "01000000000000000AA000AA0A" }, + /* 9*/ { BARCODE_CONTENT_SEGS, "01000000000000000AA000AA0A", "", "01000000000000000AA000AA0A" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -72,7 +72,7 @@ static void test_4s_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -81,18 +81,18 @@ static void test_4s_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length, symbol->text); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); @@ -746,12 +746,12 @@ static void test_2d_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, "jgb 012100123412345678ab19xy1a 0", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "jgb 012100123412345678ab19xy1a 0", -1, 0, 0, "JGB 012100123412345678AB19XY1A 0 ", -1, 3 }, + /* 1*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "jgb 012100123412345678ab19xy1a 0", -1, 0, 0, "JGB 012100123412345678AB19XY1A 0 ", -1, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -783,23 +783,23 @@ static void test_2d_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } diff --git a/backend/tests/test_maxicode.c b/backend/tests/test_maxicode.c index 264edecf..98daee32 100644 --- a/backend/tests/test_maxicode.c +++ b/backend/tests/test_maxicode.c @@ -1924,20 +1924,20 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 3*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 3*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 4*/ { DATA_MODE, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 5*/ { DATA_MODE, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 5*/ { DATA_MODE, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 6*/ { UNICODE_MODE, 26, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 7*/ { UNICODE_MODE, 26, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 7*/ { UNICODE_MODE, 26, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 8*/ { UNICODE_MODE, 899, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 9*/ { UNICODE_MODE, 899, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 9*/ { UNICODE_MODE, 899, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -1969,23 +1969,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -2006,17 +2006,17 @@ static void test_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 33, 30, {{0}}, 0 }, - /* 1*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 33, 30, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 33, 30, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 33, 30, {{0}}, 0 }, - /* 3*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 33, 30, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 3*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 33, 30, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 4*/ { DATA_MODE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 33, 30, {{0}}, 0 }, - /* 5*/ { DATA_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 33, 30, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 5*/ { DATA_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 33, 30, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -2050,31 +2050,31 @@ static void test_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_medical.c b/backend/tests/test_medical.c index 107ef843..450d4320 100644 --- a/backend/tests/test_medical.c +++ b/backend/tests/test_medical.c @@ -103,45 +103,45 @@ static void test_hrt(const testCtx *const p_ctx) { const char *data; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_PHARMA, -1, -1, "123456", "", "" }, /* None */ - /* 1*/ { BARCODE_PHARMA, -1, BARCODE_RAW_TEXT, "123456", "", "123456" }, + /* 1*/ { BARCODE_PHARMA, -1, BARCODE_CONTENT_SEGS, "123456", "", "123456" }, /* 2*/ { BARCODE_PHARMA_TWO, -1, -1, "123456", "", "" }, /* None */ - /* 3*/ { BARCODE_PHARMA_TWO, -1, BARCODE_RAW_TEXT, "123456", "", "123456" }, + /* 3*/ { BARCODE_PHARMA_TWO, -1, BARCODE_CONTENT_SEGS, "123456", "", "123456" }, /* 4*/ { BARCODE_CODE32, -1, -1, "123456", "A001234564", "" }, - /* 5*/ { BARCODE_CODE32, -1, BARCODE_RAW_TEXT, "123456", "A001234564", "015PN4" }, /* Actual encoded CODE39 value */ + /* 5*/ { BARCODE_CODE32, -1, BARCODE_CONTENT_SEGS, "123456", "A001234564", "015PN4" }, /* Actual encoded CODE39 value */ /* 6*/ { BARCODE_CODE32, -1, -1, "12345678", "A123456788", "" }, - /* 7*/ { BARCODE_CODE32, -1, BARCODE_RAW_TEXT, "12345678", "A123456788", "3PRM8N" }, + /* 7*/ { BARCODE_CODE32, -1, BARCODE_CONTENT_SEGS, "12345678", "A123456788", "3PRM8N" }, /* 8*/ { BARCODE_CODE32, 1, -1, "12345678", "A123456788", "" }, /* Ignore option_2 re check digits */ - /* 9*/ { BARCODE_CODE32, 1, BARCODE_RAW_TEXT, "12345678", "A123456788", "3PRM8N" }, + /* 9*/ { BARCODE_CODE32, 1, BARCODE_CONTENT_SEGS, "12345678", "A123456788", "3PRM8N" }, /* 10*/ { BARCODE_CODE32, 2, -1, "12345678", "A123456788", "" }, /* Ignore option_2 re check digits */ - /* 11*/ { BARCODE_CODE32, 2, BARCODE_RAW_TEXT, "12345678", "A123456788", "3PRM8N" }, + /* 11*/ { BARCODE_CODE32, 2, BARCODE_CONTENT_SEGS, "12345678", "A123456788", "3PRM8N" }, /* 12*/ { BARCODE_PZN, -1, -1, "12345", "PZN - 00123458", "" }, /* Pads with zeroes if length < 7 */ - /* 13*/ { BARCODE_PZN, -1, BARCODE_RAW_TEXT, "12345", "PZN - 00123458", "-00123458" }, /* Actual encoded CODE39 value */ + /* 13*/ { BARCODE_PZN, -1, BARCODE_CONTENT_SEGS, "12345", "PZN - 00123458", "-00123458" }, /* Actual encoded CODE39 value */ /* 14*/ { BARCODE_PZN, -1, -1, "123456", "PZN - 01234562", "" }, - /* 15*/ { BARCODE_PZN, -1, BARCODE_RAW_TEXT, "123456", "PZN - 01234562", "-01234562" }, + /* 15*/ { BARCODE_PZN, -1, BARCODE_CONTENT_SEGS, "123456", "PZN - 01234562", "-01234562" }, /* 16*/ { BARCODE_PZN, -1, -1, "1234567", "PZN - 12345678", "" }, - /* 17*/ { BARCODE_PZN, -1, BARCODE_RAW_TEXT, "1234567", "PZN - 12345678", "-12345678" }, + /* 17*/ { BARCODE_PZN, -1, BARCODE_CONTENT_SEGS, "1234567", "PZN - 12345678", "-12345678" }, /* 18*/ { BARCODE_PZN, -1, -1, "12345678", "PZN - 12345678", "" }, - /* 19*/ { BARCODE_PZN, -1, BARCODE_RAW_TEXT, "12345678", "PZN - 12345678", "-12345678" }, + /* 19*/ { BARCODE_PZN, -1, BARCODE_CONTENT_SEGS, "12345678", "PZN - 12345678", "-12345678" }, /* 20*/ { BARCODE_PZN, 1, -1, "1234", "PZN - 0012345", "" }, /* PZN7, pads with zeroes if length < 6 */ - /* 21*/ { BARCODE_PZN, 1, BARCODE_RAW_TEXT, "1234", "PZN - 0012345", "-0012345" }, + /* 21*/ { BARCODE_PZN, 1, BARCODE_CONTENT_SEGS, "1234", "PZN - 0012345", "-0012345" }, /* 22*/ { BARCODE_PZN, 1, -1, "12345", "PZN - 0123458", "" }, - /* 23*/ { BARCODE_PZN, 1, BARCODE_RAW_TEXT, "12345", "PZN - 0123458", "-0123458" }, + /* 23*/ { BARCODE_PZN, 1, BARCODE_CONTENT_SEGS, "12345", "PZN - 0123458", "-0123458" }, /* 24*/ { BARCODE_PZN, 1, -1, "123456", "PZN - 1234562", "" }, - /* 25*/ { BARCODE_PZN, 1, BARCODE_RAW_TEXT, "123456", "PZN - 1234562", "-1234562" }, + /* 25*/ { BARCODE_PZN, 1, BARCODE_CONTENT_SEGS, "123456", "PZN - 1234562", "-1234562" }, /* 26*/ { BARCODE_PZN, 1, -1, "1234562", "PZN - 1234562", "" }, - /* 27*/ { BARCODE_PZN, 1, BARCODE_RAW_TEXT, "1234562", "PZN - 1234562", "-1234562" }, + /* 27*/ { BARCODE_PZN, 1, BARCODE_CONTENT_SEGS, "1234562", "PZN - 1234562", "-1234562" }, /* 28*/ { BARCODE_PZN, 2, -1, "12345", "PZN - 00123458", "" }, /* Ignore option_2 re check digits */ - /* 29*/ { BARCODE_PZN, 2, BARCODE_RAW_TEXT, "12345", "PZN - 00123458", "-00123458" }, + /* 29*/ { BARCODE_PZN, 2, BARCODE_CONTENT_SEGS, "12345", "PZN - 00123458", "-00123458" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -156,7 +156,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, data[i].option_2, -1 /*option_3*/, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -165,18 +165,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length, symbol->text); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_pdf417.c b/backend/tests/test_pdf417.c index 8de10ca2..319529a0 100644 --- a/backend/tests/test_pdf417.c +++ b/backend/tests/test_pdf417.c @@ -4905,36 +4905,36 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_PDF417, UNICODE_MODE, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { BARCODE_PDF417, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { BARCODE_PDF417, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { BARCODE_PDF417, UNICODE_MODE, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 3*/ { BARCODE_PDF417, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 3*/ { BARCODE_PDF417, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 4*/ { BARCODE_PDF417, DATA_MODE, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 5*/ { BARCODE_PDF417, DATA_MODE, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 5*/ { BARCODE_PDF417, DATA_MODE, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 6*/ { BARCODE_PDF417, UNICODE_MODE, 26, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 7*/ { BARCODE_PDF417, UNICODE_MODE, 26, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 7*/ { BARCODE_PDF417, UNICODE_MODE, 26, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 8*/ { BARCODE_PDF417, UNICODE_MODE, 899, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 9*/ { BARCODE_PDF417, UNICODE_MODE, 899, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 9*/ { BARCODE_PDF417, UNICODE_MODE, 899, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, /* 10*/ { BARCODE_HIBC_PDF, UNICODE_MODE, -1, -1, "H123ABC01234567890", -1, 0, 0, "", -1, 0 }, - /* 11*/ { BARCODE_HIBC_PDF, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "H123ABC01234567890", -1, 0, 0, "+H123ABC01234567890D", -1, 3 }, + /* 11*/ { BARCODE_HIBC_PDF, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "H123ABC01234567890", -1, 0, 0, "+H123ABC01234567890D", -1, 3 }, /* 12*/ { BARCODE_PDF417COMP, UNICODE_MODE, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 13*/ { BARCODE_PDF417COMP, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, + /* 13*/ { BARCODE_PDF417COMP, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* 14*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 15*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, + /* 15*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* 16*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 17*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 17*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 18*/ { BARCODE_MICROPDF417, DATA_MODE, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 19*/ { BARCODE_MICROPDF417, DATA_MODE, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 19*/ { BARCODE_MICROPDF417, DATA_MODE, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 20*/ { BARCODE_MICROPDF417, UNICODE_MODE, 26, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 21*/ { BARCODE_MICROPDF417, UNICODE_MODE, 26, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 21*/ { BARCODE_MICROPDF417, UNICODE_MODE, 26, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 22*/ { BARCODE_MICROPDF417, UNICODE_MODE, 899, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 23*/ { BARCODE_MICROPDF417, UNICODE_MODE, 899, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 23*/ { BARCODE_MICROPDF417, UNICODE_MODE, 899, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, /* 24*/ { BARCODE_HIBC_MICPDF, UNICODE_MODE, -1, -1, "H123ABC01234567890", -1, 0, 0, "", -1, 0 }, - /* 25*/ { BARCODE_HIBC_MICPDF, UNICODE_MODE, -1, BARCODE_RAW_TEXT, "H123ABC01234567890", -1, 0, 0, "+H123ABC01234567890D", -1, 3 }, + /* 25*/ { BARCODE_HIBC_MICPDF, UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "H123ABC01234567890", -1, 0, 0, "+H123ABC01234567890D", -1, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -4966,23 +4966,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -5004,25 +5004,25 @@ static void test_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_PDF417, UNICODE_MODE, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 8, 103, {{0}}, 0 }, - /* 1*/ { BARCODE_PDF417, UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 8, 103, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { BARCODE_PDF417, UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 8, 103, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { BARCODE_PDF417, UNICODE_MODE, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 8, 120, {{0}}, 0 }, - /* 3*/ { BARCODE_PDF417, UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 8, 120, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 3*/ { BARCODE_PDF417, UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 8, 120, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 4*/ { BARCODE_PDF417, DATA_MODE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 8, 120, {{0}}, 0 }, - /* 5*/ { BARCODE_PDF417, DATA_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 8, 120, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 5*/ { BARCODE_PDF417, DATA_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 8, 120, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, /* 6*/ { BARCODE_PDF417COMP, UNICODE_MODE, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 8, 69, {{0}}, 0 }, - /* 7*/ { BARCODE_PDF417COMP, UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 8, 69, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, + /* 7*/ { BARCODE_PDF417COMP, UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 8, 69, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* 8*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 6, 82, {{0}}, 0 }, - /* 9*/ { BARCODE_MICROPDF417, UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 6, 82, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, + /* 9*/ { BARCODE_MICROPDF417, UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 6, 82, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* 10*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 24, 38, {{0}}, 0 }, - /* 11*/ { BARCODE_MICROPDF417, UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 24, 38, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 11*/ { BARCODE_MICROPDF417, UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 24, 38, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 12*/ { BARCODE_MICROPDF417, DATA_MODE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 24, 38, {{0}}, 0 }, - /* 13*/ { BARCODE_MICROPDF417, DATA_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 24, 38, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 13*/ { BARCODE_MICROPDF417, DATA_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 24, 38, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -5056,31 +5056,31 @@ static void test_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_plessey.c b/backend/tests/test_plessey.c index ab75857d..5e3d355d 100644 --- a/backend/tests/test_plessey.c +++ b/backend/tests/test_plessey.c @@ -113,91 +113,91 @@ static void test_hrt(const testCtx *const p_ctx) { const char *data; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_MSI_PLESSEY, -1, -1, "1234567", "1234567", "" }, - /* 1*/ { BARCODE_MSI_PLESSEY, -1, BARCODE_RAW_TEXT, "1234567", "1234567", "1234567" }, + /* 1*/ { BARCODE_MSI_PLESSEY, -1, BARCODE_CONTENT_SEGS, "1234567", "1234567", "1234567" }, /* 2*/ { BARCODE_MSI_PLESSEY, 0, -1, "1234567", "1234567", "" }, - /* 3*/ { BARCODE_MSI_PLESSEY, 0, BARCODE_RAW_TEXT, "1234567", "1234567", "1234567" }, + /* 3*/ { BARCODE_MSI_PLESSEY, 0, BARCODE_CONTENT_SEGS, "1234567", "1234567", "1234567" }, /* 4*/ { BARCODE_MSI_PLESSEY, 1, -1, "1234567", "12345674", "" }, - /* 5*/ { BARCODE_MSI_PLESSEY, 1, BARCODE_RAW_TEXT, "1234567", "12345674", "12345674" }, + /* 5*/ { BARCODE_MSI_PLESSEY, 1, BARCODE_CONTENT_SEGS, "1234567", "12345674", "12345674" }, /* 6*/ { BARCODE_MSI_PLESSEY, 1 + 10, -1, "1234567", "1234567", "" }, - /* 7*/ { BARCODE_MSI_PLESSEY, 1 + 10, BARCODE_RAW_TEXT, "1234567", "1234567", "12345674" }, + /* 7*/ { BARCODE_MSI_PLESSEY, 1 + 10, BARCODE_CONTENT_SEGS, "1234567", "1234567", "12345674" }, /* 8*/ { BARCODE_MSI_PLESSEY, 1, -1, "9999999999", "99999999990", "" }, - /* 9*/ { BARCODE_MSI_PLESSEY, 1, BARCODE_RAW_TEXT, "9999999999", "99999999990", "99999999990" }, + /* 9*/ { BARCODE_MSI_PLESSEY, 1, BARCODE_CONTENT_SEGS, "9999999999", "99999999990", "99999999990" }, /* 10*/ { BARCODE_MSI_PLESSEY, 2, -1, "1234567", "123456741", "" }, - /* 11*/ { BARCODE_MSI_PLESSEY, 2, BARCODE_RAW_TEXT, "1234567", "123456741", "123456741" }, + /* 11*/ { BARCODE_MSI_PLESSEY, 2, BARCODE_CONTENT_SEGS, "1234567", "123456741", "123456741" }, /* 12*/ { BARCODE_MSI_PLESSEY, 2 + 10, -1, "1234567", "1234567", "" }, - /* 13*/ { BARCODE_MSI_PLESSEY, 2 + 10, BARCODE_RAW_TEXT, "1234567", "1234567", "123456741" }, + /* 13*/ { BARCODE_MSI_PLESSEY, 2 + 10, BARCODE_CONTENT_SEGS, "1234567", "1234567", "123456741" }, /* 14*/ { BARCODE_MSI_PLESSEY, 2, -1, "9999999999", "999999999900", "" }, - /* 15*/ { BARCODE_MSI_PLESSEY, 2, BARCODE_RAW_TEXT, "9999999999", "999999999900", "999999999900" }, + /* 15*/ { BARCODE_MSI_PLESSEY, 2, BARCODE_CONTENT_SEGS, "9999999999", "999999999900", "999999999900" }, /* 16*/ { BARCODE_MSI_PLESSEY, 3, -1, "1234567", "12345674", "" }, - /* 17*/ { BARCODE_MSI_PLESSEY, 3, BARCODE_RAW_TEXT, "1234567", "12345674", "12345674" }, + /* 17*/ { BARCODE_MSI_PLESSEY, 3, BARCODE_CONTENT_SEGS, "1234567", "12345674", "12345674" }, /* 18*/ { BARCODE_MSI_PLESSEY, 3 + 10, -1, "1234567", "1234567", "" }, - /* 19*/ { BARCODE_MSI_PLESSEY, 3 + 10, BARCODE_RAW_TEXT, "1234567", "1234567", "12345674" }, + /* 19*/ { BARCODE_MSI_PLESSEY, 3 + 10, BARCODE_CONTENT_SEGS, "1234567", "1234567", "12345674" }, /* 20*/ { BARCODE_MSI_PLESSEY, 3, -1, "9999999999", "99999999995", "" }, - /* 21*/ { BARCODE_MSI_PLESSEY, 3, BARCODE_RAW_TEXT, "9999999999", "99999999995", "99999999995" }, + /* 21*/ { BARCODE_MSI_PLESSEY, 3, BARCODE_CONTENT_SEGS, "9999999999", "99999999995", "99999999995" }, /* 22*/ { BARCODE_MSI_PLESSEY, 4, -1, "1234567", "123456741", "" }, - /* 23*/ { BARCODE_MSI_PLESSEY, 4, BARCODE_RAW_TEXT, "1234567", "123456741", "123456741" }, + /* 23*/ { BARCODE_MSI_PLESSEY, 4, BARCODE_CONTENT_SEGS, "1234567", "123456741", "123456741" }, /* 24*/ { BARCODE_MSI_PLESSEY, 4 + 10, -1, "1234567", "1234567", "" }, - /* 25*/ { BARCODE_MSI_PLESSEY, 4 + 10, BARCODE_RAW_TEXT, "1234567", "1234567", "123456741" }, + /* 25*/ { BARCODE_MSI_PLESSEY, 4 + 10, BARCODE_CONTENT_SEGS, "1234567", "1234567", "123456741" }, /* 26*/ { BARCODE_MSI_PLESSEY, 4, -1, "9999999999", "999999999959", "" }, - /* 27*/ { BARCODE_MSI_PLESSEY, 4, BARCODE_RAW_TEXT, "9999999999", "999999999959", "999999999959" }, + /* 27*/ { BARCODE_MSI_PLESSEY, 4, BARCODE_CONTENT_SEGS, "9999999999", "999999999959", "999999999959" }, /* 28*/ { BARCODE_MSI_PLESSEY, 5, -1, "1234567", "12345679", "" }, - /* 29*/ { BARCODE_MSI_PLESSEY, 5, BARCODE_RAW_TEXT, "1234567", "12345679", "12345679" }, + /* 29*/ { BARCODE_MSI_PLESSEY, 5, BARCODE_CONTENT_SEGS, "1234567", "12345679", "12345679" }, /* 30*/ { BARCODE_MSI_PLESSEY, 5 + 10, -1, "1234567", "1234567", "" }, - /* 31*/ { BARCODE_MSI_PLESSEY, 5 + 10, BARCODE_RAW_TEXT, "1234567", "1234567", "12345679" }, + /* 31*/ { BARCODE_MSI_PLESSEY, 5 + 10, BARCODE_CONTENT_SEGS, "1234567", "1234567", "12345679" }, /* 32*/ { BARCODE_MSI_PLESSEY, 5, -1, "9999999999", "999999999910", "" }, - /* 33*/ { BARCODE_MSI_PLESSEY, 5, BARCODE_RAW_TEXT, "9999999999", "999999999910", "999999999910" }, + /* 33*/ { BARCODE_MSI_PLESSEY, 5, BARCODE_CONTENT_SEGS, "9999999999", "999999999910", "999999999910" }, /* 34*/ { BARCODE_MSI_PLESSEY, 6, -1, "1234567", "123456790", "" }, - /* 35*/ { BARCODE_MSI_PLESSEY, 6, BARCODE_RAW_TEXT, "1234567", "123456790", "123456790" }, + /* 35*/ { BARCODE_MSI_PLESSEY, 6, BARCODE_CONTENT_SEGS, "1234567", "123456790", "123456790" }, /* 36*/ { BARCODE_MSI_PLESSEY, 6 + 10, -1, "1234567", "1234567", "" }, - /* 37*/ { BARCODE_MSI_PLESSEY, 6 + 10, BARCODE_RAW_TEXT, "1234567", "1234567", "123456790" }, + /* 37*/ { BARCODE_MSI_PLESSEY, 6 + 10, BARCODE_CONTENT_SEGS, "1234567", "1234567", "123456790" }, /* 38*/ { BARCODE_MSI_PLESSEY, 6, -1, "9999999999", "9999999999109", "" }, - /* 39*/ { BARCODE_MSI_PLESSEY, 6, BARCODE_RAW_TEXT, "9999999999", "9999999999109", "9999999999109" }, + /* 39*/ { BARCODE_MSI_PLESSEY, 6, BARCODE_CONTENT_SEGS, "9999999999", "9999999999109", "9999999999109" }, /* 40*/ { BARCODE_MSI_PLESSEY, 1, -1, "123456", "1234566", "" }, - /* 41*/ { BARCODE_MSI_PLESSEY, 1, BARCODE_RAW_TEXT, "123456", "1234566", "1234566" }, + /* 41*/ { BARCODE_MSI_PLESSEY, 1, BARCODE_CONTENT_SEGS, "123456", "1234566", "1234566" }, /* 42*/ { BARCODE_MSI_PLESSEY, 2, -1, "123456", "12345666", "" }, - /* 43*/ { BARCODE_MSI_PLESSEY, 2, BARCODE_RAW_TEXT, "123456", "12345666", "12345666" }, + /* 43*/ { BARCODE_MSI_PLESSEY, 2, BARCODE_CONTENT_SEGS, "123456", "12345666", "12345666" }, /* 44*/ { BARCODE_MSI_PLESSEY, 3, -1, "123456", "1234560", "" }, - /* 45*/ { BARCODE_MSI_PLESSEY, 3, BARCODE_RAW_TEXT, "123456", "1234560", "1234560" }, + /* 45*/ { BARCODE_MSI_PLESSEY, 3, BARCODE_CONTENT_SEGS, "123456", "1234560", "1234560" }, /* 46*/ { BARCODE_MSI_PLESSEY, 4, -1, "123456", "12345609", "" }, - /* 47*/ { BARCODE_MSI_PLESSEY, 4, BARCODE_RAW_TEXT, "123456", "12345609", "12345609" }, + /* 47*/ { BARCODE_MSI_PLESSEY, 4, BARCODE_CONTENT_SEGS, "123456", "12345609", "12345609" }, /* 48*/ { BARCODE_MSI_PLESSEY, 3, -1, "2211", "221110", "" }, /* Mod-11 check digit '10' */ - /* 49*/ { BARCODE_MSI_PLESSEY, 3, BARCODE_RAW_TEXT, "2211", "221110", "221110" }, + /* 49*/ { BARCODE_MSI_PLESSEY, 3, BARCODE_CONTENT_SEGS, "2211", "221110", "221110" }, /* 50*/ { BARCODE_MSI_PLESSEY, 3 + 10, -1, "2211", "2211", "" }, /* Mod-11 check digit '10' */ - /* 51*/ { BARCODE_MSI_PLESSEY, 3 + 10, BARCODE_RAW_TEXT, "2211", "2211", "221110" }, + /* 51*/ { BARCODE_MSI_PLESSEY, 3 + 10, BARCODE_CONTENT_SEGS, "2211", "2211", "221110" }, /* 52*/ { BARCODE_MSI_PLESSEY, 4, -1, "2211", "2211100", "" }, - /* 53*/ { BARCODE_MSI_PLESSEY, 4, BARCODE_RAW_TEXT, "2211", "2211100", "2211100" }, + /* 53*/ { BARCODE_MSI_PLESSEY, 4, BARCODE_CONTENT_SEGS, "2211", "2211100", "2211100" }, /* 54*/ { BARCODE_MSI_PLESSEY, 4 + 10, -1, "2211", "2211", "" }, - /* 55*/ { BARCODE_MSI_PLESSEY, 4 + 10, BARCODE_RAW_TEXT, "2211", "2211", "2211100" }, + /* 55*/ { BARCODE_MSI_PLESSEY, 4 + 10, BARCODE_CONTENT_SEGS, "2211", "2211", "2211100" }, /* 56*/ { BARCODE_PLESSEY, -1, -1, "0123456789ABCDEF", "0123456789ABCDEF", "" }, - /* 57*/ { BARCODE_PLESSEY, -1, BARCODE_RAW_TEXT, "0123456789ABCDEF", "0123456789ABCDEF", "0123456789ABCDEF90" }, + /* 57*/ { BARCODE_PLESSEY, -1, BARCODE_CONTENT_SEGS, "0123456789ABCDEF", "0123456789ABCDEF", "0123456789ABCDEF90" }, /* 58*/ { BARCODE_PLESSEY, 1, -1, "0123456789ABCDEF", "0123456789ABCDEF90", "" }, - /* 59*/ { BARCODE_PLESSEY, 1, BARCODE_RAW_TEXT, "0123456789ABCDEF", "0123456789ABCDEF90", "0123456789ABCDEF90" }, + /* 59*/ { BARCODE_PLESSEY, 1, BARCODE_CONTENT_SEGS, "0123456789ABCDEF", "0123456789ABCDEF90", "0123456789ABCDEF90" }, /* 60*/ { BARCODE_PLESSEY, -1, -1, "1", "1", "" }, - /* 61*/ { BARCODE_PLESSEY, -1, BARCODE_RAW_TEXT, "1", "1", "173" }, + /* 61*/ { BARCODE_PLESSEY, -1, BARCODE_CONTENT_SEGS, "1", "1", "173" }, /* 62*/ { BARCODE_PLESSEY, 1, -1, "1", "173", "" }, - /* 63*/ { BARCODE_PLESSEY, 1, BARCODE_RAW_TEXT, "1", "173", "173" }, + /* 63*/ { BARCODE_PLESSEY, 1, BARCODE_CONTENT_SEGS, "1", "173", "173" }, /* 64*/ { BARCODE_PLESSEY, -1, -1, "7", "7", "" }, - /* 65*/ { BARCODE_PLESSEY, -1, BARCODE_RAW_TEXT, "7", "7", "758" }, + /* 65*/ { BARCODE_PLESSEY, -1, BARCODE_CONTENT_SEGS, "7", "7", "758" }, /* 66*/ { BARCODE_PLESSEY, 1, -1, "7", "758", "" }, - /* 67*/ { BARCODE_PLESSEY, 1, BARCODE_RAW_TEXT, "7", "758", "758" }, + /* 67*/ { BARCODE_PLESSEY, 1, BARCODE_CONTENT_SEGS, "7", "758", "758" }, /* 68*/ { BARCODE_PLESSEY, -1, -1, "75", "75", "" }, - /* 69*/ { BARCODE_PLESSEY, -1, BARCODE_RAW_TEXT, "75", "75", "7580" }, + /* 69*/ { BARCODE_PLESSEY, -1, BARCODE_CONTENT_SEGS, "75", "75", "7580" }, /* 70*/ { BARCODE_PLESSEY, 1, -1, "75", "7580", "" }, - /* 71*/ { BARCODE_PLESSEY, 1, BARCODE_RAW_TEXT, "75", "7580", "7580" }, + /* 71*/ { BARCODE_PLESSEY, 1, BARCODE_CONTENT_SEGS, "75", "7580", "7580" }, /* 72*/ { BARCODE_PLESSEY, -1, -1, "993", "993", "" }, - /* 73*/ { BARCODE_PLESSEY, -1, BARCODE_RAW_TEXT, "993", "993", "993AA" }, + /* 73*/ { BARCODE_PLESSEY, -1, BARCODE_CONTENT_SEGS, "993", "993", "993AA" }, /* 74*/ { BARCODE_PLESSEY, 1, -1, "993", "993AA", "" }, - /* 75*/ { BARCODE_PLESSEY, 1, BARCODE_RAW_TEXT, "993", "993AA", "993AA" }, + /* 75*/ { BARCODE_PLESSEY, 1, BARCODE_CONTENT_SEGS, "993", "993AA", "993AA" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -212,7 +212,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, data[i].option_2, -1, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -221,18 +221,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_postal.c b/backend/tests/test_postal.c index e625d423..66677490 100644 --- a/backend/tests/test_postal.c +++ b/backend/tests/test_postal.c @@ -224,36 +224,36 @@ static void test_hrt(const testCtx *const p_ctx) { const char *data; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_FLAT, -1, -1, "12345", "", "" }, /* None */ - /* 1*/ { BARCODE_FLAT, -1, BARCODE_RAW_TEXT, "12345", "", "12345" }, + /* 1*/ { BARCODE_FLAT, -1, BARCODE_CONTENT_SEGS, "12345", "", "12345" }, /* 2*/ { BARCODE_POSTNET, -1, -1, "12345", "", "" }, /* None */ - /* 3*/ { BARCODE_POSTNET, -1, BARCODE_RAW_TEXT, "12345", "", "123455" }, + /* 3*/ { BARCODE_POSTNET, -1, BARCODE_CONTENT_SEGS, "12345", "", "123455" }, /* 4*/ { BARCODE_FIM, -1, -1, "e", "", "" }, /* None */ - /* 5*/ { BARCODE_FIM, -1, BARCODE_RAW_TEXT, "e", "", "E" }, + /* 5*/ { BARCODE_FIM, -1, BARCODE_CONTENT_SEGS, "e", "", "E" }, /* 6*/ { BARCODE_CEPNET, -1, -1, "12345678", "", "" }, /* None */ - /* 7*/ { BARCODE_CEPNET, -1, BARCODE_RAW_TEXT, "12345678", "", "123456784" }, + /* 7*/ { BARCODE_CEPNET, -1, BARCODE_CONTENT_SEGS, "12345678", "", "123456784" }, /* 8*/ { BARCODE_RM4SCC, -1, -1, "BX11LT1A", "", "" }, /* None*/ - /* 9*/ { BARCODE_RM4SCC, -1, BARCODE_RAW_TEXT, "BX11LT1A", "", "BX11LT1AI" }, + /* 9*/ { BARCODE_RM4SCC, -1, BARCODE_CONTENT_SEGS, "BX11LT1A", "", "BX11LT1AI" }, /* 10*/ { BARCODE_JAPANPOST, -1, -1, "1234", "", "" }, /* None*/ - /* 11*/ { BARCODE_JAPANPOST, -1, BARCODE_RAW_TEXT, "1234", "", "1234" }, /* Note check char not included */ - /* 12*/ { BARCODE_JAPANPOST, -1, BARCODE_RAW_TEXT, "123456-AB", "", "123456-AB" }, /* Ditto */ + /* 11*/ { BARCODE_JAPANPOST, -1, BARCODE_CONTENT_SEGS, "1234", "", "1234" }, /* Note check char not included */ + /* 12*/ { BARCODE_JAPANPOST, -1, BARCODE_CONTENT_SEGS, "123456-AB", "", "123456-AB" }, /* Ditto */ /* 13*/ { BARCODE_KOREAPOST, -1, -1, "123456", "1234569", "" }, - /* 14*/ { BARCODE_KOREAPOST, -1, BARCODE_RAW_TEXT, "123456", "1234569", "1234569" }, /* No difference */ + /* 14*/ { BARCODE_KOREAPOST, -1, BARCODE_CONTENT_SEGS, "123456", "1234569", "1234569" }, /* No difference */ /* 15*/ { BARCODE_PLANET, -1, -1, "12345678901", "", "" }, /* None */ - /* 16*/ { BARCODE_PLANET, -1, BARCODE_RAW_TEXT, "12345678901", "", "123456789014" }, + /* 16*/ { BARCODE_PLANET, -1, BARCODE_CONTENT_SEGS, "12345678901", "", "123456789014" }, /* 17*/ { BARCODE_KIX, -1, -1, "0123456789ABCDEFGH", "", "" }, /* None */ - /* 18*/ { BARCODE_KIX, -1, BARCODE_RAW_TEXT, "0123456789ABCDEFGH", "", "0123456789ABCDEFGH" }, + /* 18*/ { BARCODE_KIX, -1, BARCODE_CONTENT_SEGS, "0123456789ABCDEFGH", "", "0123456789ABCDEFGH" }, /* 19*/ { BARCODE_DAFT, -1, -1, "DAFT", "", "" }, /* None */ - /* 20*/ { BARCODE_DAFT, -1, BARCODE_RAW_TEXT, "DAFT", "", "DAFT" }, + /* 20*/ { BARCODE_DAFT, -1, BARCODE_CONTENT_SEGS, "DAFT", "", "DAFT" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -268,7 +268,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, data[i].option_2, -1 /*option_3*/, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -277,18 +277,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_qr.c b/backend/tests/test_qr.c index 4b331e59..575af7c3 100644 --- a/backend/tests/test_qr.c +++ b/backend/tests/test_qr.c @@ -4868,31 +4868,31 @@ static void test_qr_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_QRCODE, UNICODE_MODE, -1, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { BARCODE_QRCODE, UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { BARCODE_QRCODE, UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { BARCODE_QRCODE, UNICODE_MODE, -1, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 3*/ { BARCODE_QRCODE, UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 3*/ { BARCODE_QRCODE, UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 4*/ { BARCODE_QRCODE, UNICODE_MODE, -1, -1, -1, "点", -1, ZINT_WARN_NONCOMPLIANT, 0, "", -1, 0 }, - /* 5*/ { BARCODE_QRCODE, UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "点", -1, ZINT_WARN_NONCOMPLIANT, 0, "点", -1, 20 }, /* When single segment will try ECI 20 as secondary default */ + /* 5*/ { BARCODE_QRCODE, UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "点", -1, ZINT_WARN_NONCOMPLIANT, 0, "点", -1, 20 }, /* When single segment will try ECI 20 as secondary default */ /* 6*/ { BARCODE_QRCODE, DATA_MODE, -1, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 7*/ { BARCODE_QRCODE, DATA_MODE, -1, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 7*/ { BARCODE_QRCODE, DATA_MODE, -1, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 8*/ { BARCODE_QRCODE, DATA_MODE, -1, ZINT_FULL_MULTIBYTE, -1, "\223\137", -1, 0, 0, "", -1, 0 }, - /* 9*/ { BARCODE_QRCODE, DATA_MODE, -1, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, "\223\137", -1, 0, 0, "\223\137", -1, 3 }, /* Note "wrong" raw ECI, needs to be specified */ + /* 9*/ { BARCODE_QRCODE, DATA_MODE, -1, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, "\223\137", -1, 0, 0, "\223\137", -1, 3 }, /* Note "wrong" content seg ECI, needs to be specified */ /* 10*/ { BARCODE_QRCODE, DATA_MODE, 20, ZINT_FULL_MULTIBYTE, -1, "\223\137", -1, 0, 20, "", -1, 0 }, - /* 11*/ { BARCODE_QRCODE, DATA_MODE, 20, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, "\223\137", -1, 0, 20, "\223\137", -1, 20 }, + /* 11*/ { BARCODE_QRCODE, DATA_MODE, 20, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, "\223\137", -1, 0, 20, "\223\137", -1, 20 }, /* 12*/ { BARCODE_QRCODE, UNICODE_MODE, 26, -1, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 13*/ { BARCODE_QRCODE, UNICODE_MODE, 26, -1, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 13*/ { BARCODE_QRCODE, UNICODE_MODE, 26, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 14*/ { BARCODE_QRCODE, UNICODE_MODE, 899, -1, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 15*/ { BARCODE_QRCODE, UNICODE_MODE, 899, -1, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 15*/ { BARCODE_QRCODE, UNICODE_MODE, 899, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, /* 16*/ { BARCODE_QRCODE, GS1_MODE, -1, -1, -1, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "", -1, 0 }, - /* 17*/ { BARCODE_QRCODE, GS1_MODE, -1, -1, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, /* Note raw text ECI set as is converted */ - /* 18*/ { BARCODE_QRCODE, GS1_MODE, 170, -1, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, ZINT_WARN_NONCOMPLIANT, 170, "01049123451234591597033130128\03510ABC123", -1, 170 }, + /* 17*/ { BARCODE_QRCODE, GS1_MODE, -1, -1, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, /* Note content seg ECI set as is converted */ + /* 18*/ { BARCODE_QRCODE, GS1_MODE, 170, -1, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, ZINT_WARN_NONCOMPLIANT, 170, "01049123451234591597033130128\03510ABC123", -1, 170 }, /* 19*/ { BARCODE_HIBC_QR, UNICODE_MODE, -1, -1, -1, "H123ABC01234567890", -1, 0, 0, "", -1, 0 }, - /* 20*/ { BARCODE_HIBC_QR, UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "H123ABC01234567890", -1, 0, 0, "+H123ABC01234567890D", -1, 3 }, + /* 20*/ { BARCODE_HIBC_QR, UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "H123ABC01234567890", -1, 0, 0, "+H123ABC01234567890D", -1, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -4924,23 +4924,23 @@ static void test_qr_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -4962,21 +4962,21 @@ static void test_qr_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 21, 21, {{0}}, 0 }, - /* 1*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 21, 21, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 21, 21, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, { { TU("点"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, ZINT_WARN_USES_ECI, 21, 21, {{0}}, 0 }, - /* 3*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("点"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, ZINT_WARN_USES_ECI, 21, 21, { { TU("点"), 3, 26 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* When multiple segments, ECI 20 is not used as secondary default, so fails and retries with `get_best_eci()` */ + /* 3*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("点"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, ZINT_WARN_USES_ECI, 21, 21, { { TU("点"), 3, 26 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* When multiple segments, ECI 20 is not used as secondary default, so fails and retries with `get_best_eci()` */ /* 4*/ { UNICODE_MODE, -1, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 21, 21, {{0}}, 0 }, - /* 5*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 21, 21, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 5*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 21, 21, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 6*/ { DATA_MODE, -1, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 21, 21, {{0}}, 0 }, - /* 7*/ { DATA_MODE, -1, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 21, 21, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 7*/ { DATA_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 21, 21, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, /* 8*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 21, 21, {{0}}, 0 }, - /* 9*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 21, 21, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 9*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 21, 21, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -5010,31 +5010,31 @@ static void test_qr_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); @@ -6683,18 +6683,18 @@ static void test_microqr_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, "点", -1, 0, 0, "", -1, 0 }, - /* 3*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, "点", -1, 0, 0, "点", -1, 20 }, + /* 3*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "点", -1, 0, 0, "点", -1, 20 }, /* 4*/ { DATA_MODE, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 5*/ { DATA_MODE, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 5*/ { DATA_MODE, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 6*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, -1, "\223\137", -1, 0, 0, "", -1, 0 }, - /* 7*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, "\223\137", -1, 0, 0, "\223\137", -1, 3 }, /* Note "wrong" raw ECI, but no way to specify */ + /* 7*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, "\223\137", -1, 0, 0, "\223\137", -1, 3 }, /* Note "wrong" content seg ECI, but no way to specify */ }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -6726,23 +6726,23 @@ static void test_microqr_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -7473,16 +7473,16 @@ static void test_upnqr_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 4 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 4 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, "Ŕ", -1, 0, 0, "", -1, 0 }, - /* 3*/ { UNICODE_MODE, BARCODE_RAW_TEXT, "Ŕ", -1, 0, 0, "Ŕ", -1, 4 }, + /* 3*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, "Ŕ", -1, 0, 0, "Ŕ", -1, 4 }, /* 4*/ { DATA_MODE, -1, "\300", -1, 0, 0, "", -1, 0 }, - /* 5*/ { DATA_MODE, BARCODE_RAW_TEXT, "\300", -1, 0, 0, "\300", -1, 4 }, + /* 5*/ { DATA_MODE, BARCODE_CONTENT_SEGS, "\300", -1, 0, 0, "\300", -1, 4 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -7514,23 +7514,23 @@ static void test_upnqr_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -9520,30 +9520,30 @@ static void test_rmqr_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 3*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 3*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 4*/ { UNICODE_MODE, -1, -1, -1, "点", -1, ZINT_WARN_NONCOMPLIANT, 0, "", -1, 0 }, - /* 5*/ { UNICODE_MODE, -1, -1, BARCODE_RAW_TEXT, "点", -1, ZINT_WARN_NONCOMPLIANT, 0, "点", -1, 20 }, + /* 5*/ { UNICODE_MODE, -1, -1, BARCODE_CONTENT_SEGS, "点", -1, ZINT_WARN_NONCOMPLIANT, 0, "点", -1, 20 }, /* 6*/ { DATA_MODE, -1, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 7*/ { DATA_MODE, -1, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 7*/ { DATA_MODE, -1, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 8*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, -1, "\223\137", -1, 0, 0, "", -1, 0 }, - /* 9*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, "\223\137", -1, 0, 0, "\223\137", -1, 3 }, /* Note "wrong" raw ECI, needs to be specified */ + /* 9*/ { DATA_MODE, -1, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, "\223\137", -1, 0, 0, "\223\137", -1, 3 }, /* Note "wrong" content seg ECI, needs to be specified */ /* 10*/ { DATA_MODE, 20, ZINT_FULL_MULTIBYTE, -1, "\223\137", -1, 0, 20, "", -1, 0 }, - /* 11*/ { DATA_MODE, 20, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, "\223\137", -1, 0, 20, "\223\137", -1, 20 }, + /* 11*/ { DATA_MODE, 20, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, "\223\137", -1, 0, 20, "\223\137", -1, 20 }, /* 12*/ { UNICODE_MODE, 26, -1, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 13*/ { UNICODE_MODE, 26, -1, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 13*/ { UNICODE_MODE, 26, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 14*/ { UNICODE_MODE, 899, -1, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 15*/ { UNICODE_MODE, 899, -1, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 15*/ { UNICODE_MODE, 899, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, /* 16*/ { GS1_MODE, -1, -1, -1, "[20]12", -1, 0, 0, "", -1, 0 }, - /* 17*/ { GS1_MODE, -1, -1, BARCODE_RAW_TEXT, "[20]12", -1, 0, 0, "2012", -1, 3 }, + /* 17*/ { GS1_MODE, -1, -1, BARCODE_CONTENT_SEGS, "[20]12", -1, 0, 0, "2012", -1, 3 }, /* 18*/ { GS1_MODE, 32, -1, -1, "[20]12", -1, ZINT_WARN_NONCOMPLIANT, 32, "", -1, 0 }, - /* 19*/ { GS1_MODE, 32, -1, BARCODE_RAW_TEXT, "[20]12", -1, ZINT_WARN_NONCOMPLIANT, 32, "2012", -1, 32 }, /* Note raw text ECI set as is converted */ + /* 19*/ { GS1_MODE, 32, -1, BARCODE_CONTENT_SEGS, "[20]12", -1, ZINT_WARN_NONCOMPLIANT, 32, "2012", -1, 32 }, /* Note content seg ECI set as is converted */ }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -9575,23 +9575,23 @@ static void test_rmqr_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -9613,19 +9613,19 @@ static void test_rmqr_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 11, 27, {{0}}, 0 }, - /* 1*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 11, 27, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 11, 27, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 11, 43, {{0}}, 0 }, - /* 3*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 11, 43, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 3*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 11, 43, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 4*/ { DATA_MODE, -1, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 11, 43, {{0}}, 0 }, - /* 5*/ { DATA_MODE, -1, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 11, 43, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 5*/ { DATA_MODE, -1, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 11, 43, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, /* 6*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 11, 43, {{0}}, 0 }, - /* 7*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 11, 43, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 7*/ { DATA_MODE, ZINT_FULL_MULTIBYTE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 11, 43, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -9659,31 +9659,31 @@ static void test_rmqr_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_raster.c b/backend/tests/test_raster.c index 24d4a8fd..54adc0a8 100644 --- a/backend/tests/test_raster.c +++ b/backend/tests/test_raster.c @@ -511,8 +511,8 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { static const struct item data[] = { /* 0*/ { BARCODE_EAN13, -1, -1, "123456789012", 0, 50, 1, 95, 226, 116, 102 /*text_row*/, 0, 22, -1, -1, -1 }, /* 1*/ { BARCODE_EANX, -1, -1, "123456789012", 0, 50, 1, 95, 226, 116, 102 /*text_row*/, 0, 22, -1, -1, -1 }, /* EAN-13 */ - /* 2*/ { BARCODE_EAN13, -1, BARCODE_RAW_TEXT, "123456789012", 0, 50, 1, 95, 226, 116, 102 /*text_row*/, 0, 22, -1, -1, -1 }, - /* 3*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "123456789012", 0, 50, 1, 95, 226, 116, 102 /*text_row*/, 0, 22, -1, -1, -1 }, /* EAN-13 */ + /* 2*/ { BARCODE_EAN13, -1, BARCODE_CONTENT_SEGS, "123456789012", 0, 50, 1, 95, 226, 116, 102 /*text_row*/, 0, 22, -1, -1, -1 }, + /* 3*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "123456789012", 0, 50, 1, 95, 226, 116, 102 /*text_row*/, 0, 22, -1, -1, -1 }, /* EAN-13 */ /* 4*/ { BARCODE_EAN13, 0, -1, "123456789012", 0, 50, 1, 95, 226, 110, 102 /*text_row*/, 0, 22, -1, -1, -1 }, /* 5*/ { BARCODE_EANX, 0, -1, "123456789012", 0, 50, 1, 95, 226, 110, 102 /*text_row*/, 0, 22, -1, -1, -1 }, /* EAN-13 */ /* 6*/ { BARCODE_EAN13, -1, EANUPC_GUARD_WHITESPACE, "123456789012", 0, 50, 1, 95, 226, 116, 108 /*text_row*/, 212, 14, -1, -1, -1 }, @@ -524,27 +524,27 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { /* 12*/ { BARCODE_EANX_CHK, -1, -1, "1234567890128", 0, 50, 1, 95, 226, 116, 102 /*text_row*/, 0, 22, -1, -1, -1 }, /* EAN-13 */ /* 13*/ { BARCODE_EANX_CHK, 0, -1, "1234567890128", 0, 50, 1, 95, 226, 110, 102 /*text_row*/, 0, 22, -1, -1, -1 }, /* EAN-13 */ /* 14*/ { BARCODE_EANX_CHK, -1, -1, "1234567890128+12", 0, 50, 1, 122, 276, 116, 102 /*text_row*/, 0, 22, 5, 212, 64 }, /* EAN-13 + EAN-2 */ - /* 15*/ { BARCODE_EANX_CHK, -1, BARCODE_RAW_TEXT, "1234567890128+12", 0, 50, 1, 122, 276, 116, 102 /*text_row*/, 0, 22, 5, 212, 64 }, /* EAN-13 + EAN-2 */ + /* 15*/ { BARCODE_EANX_CHK, -1, BARCODE_CONTENT_SEGS, "1234567890128+12", 0, 50, 1, 122, 276, 116, 102 /*text_row*/, 0, 22, 5, 212, 64 }, /* EAN-13 + EAN-2 */ /* 16*/ { BARCODE_EANX_CHK, 0, -1, "1234567890128+12", 0, 50, 1, 122, 276, 110, 102 /*text_row*/, 0, 22, 5, 212, 64 }, /* EAN-13 + EAN-2 */ /* 17*/ { BARCODE_EANX_CHK, -1, EANUPC_GUARD_WHITESPACE, "1234567890128+12", 0, 50, 1, 122, 276, 116, 102 /*text_row*/, 0, 22, 6, 264, 12 }, /* EAN-13 + EAN-2 */ /* 18*/ { BARCODE_EANX_CHK, 0, EANUPC_GUARD_WHITESPACE, "1234567890128+12", 0, 50, 1, 122, 276, 110, 102 /*text_row*/, 0, 22, 6, 264, 12 }, /* EAN-13 + EAN-2 */ /* 19*/ { BARCODE_EANX_CHK, 1 /*empty*/, -1, "1234567890128+12", 0, 50, 1, 122, 276, 116, 6 /*text_row*/, 264, 12, -1, -1, -1 }, /* EAN-13 + EAN-2 */ /* 20*/ { BARCODE_EAN13, -1, -1, "1234567890128+12345", 0, 50, 1, 149, 330, 116, 102 /*text_row*/, 0, 22, 5, 212, 118 }, /* 21*/ { BARCODE_EANX, -1, -1, "1234567890128+12345", 0, 50, 1, 149, 330, 116, 102 /*text_row*/, 0, 22, 5, 212, 118 }, /* EAN-13 + EAN-5 */ - /* 22*/ { BARCODE_EAN13, -1, BARCODE_RAW_TEXT, "1234567890128+12345", 0, 50, 1, 149, 330, 116, 102 /*text_row*/, 0, 22, 5, 212, 118 }, - /* 23*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "1234567890128+12345", 0, 50, 1, 149, 330, 116, 102 /*text_row*/, 0, 22, 5, 212, 118 }, /* EAN-13 + EAN-5 */ + /* 22*/ { BARCODE_EAN13, -1, BARCODE_CONTENT_SEGS, "1234567890128+12345", 0, 50, 1, 149, 330, 116, 102 /*text_row*/, 0, 22, 5, 212, 118 }, + /* 23*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "1234567890128+12345", 0, 50, 1, 149, 330, 116, 102 /*text_row*/, 0, 22, 5, 212, 118 }, /* EAN-13 + EAN-5 */ /* 24*/ { BARCODE_EAN13, 0, -1, "1234567890128+12345", 0, 50, 1, 149, 330, 110, 102 /*text_row*/, 0, 22, 5, 212, 118 }, /* 25*/ { BARCODE_EANX, 0, -1, "1234567890128+12345", 0, 50, 1, 149, 330, 110, 102 /*text_row*/, 0, 22, 5, 212, 118 }, /* EAN-13 + EAN-5 */ /* 26*/ { BARCODE_ISBNX, -1, -1, "9784567890120+12345", 0, 50, 1, 149, 330, 116, 102 /*text_row*/, 0, 22, 5, 212, 118 }, /* ISBNX + EAN-5 */ - /* 27*/ { BARCODE_ISBNX, -1, BARCODE_RAW_TEXT, "9784567890120+12345", 0, 50, 1, 149, 330, 116, 102 /*text_row*/, 0, 22, 5, 212, 118 }, /* ISBNX + EAN-5 */ + /* 27*/ { BARCODE_ISBNX, -1, BARCODE_CONTENT_SEGS, "9784567890120+12345", 0, 50, 1, 149, 330, 116, 102 /*text_row*/, 0, 22, 5, 212, 118 }, /* ISBNX + EAN-5 */ /* 28*/ { BARCODE_ISBNX, 0, -1, "9784567890120+12345", 0, 50, 1, 149, 330, 110, 102 /*text_row*/, 0, 22, 5, 212, 118 }, /* ISBNX + EAN-5 */ /* 29*/ { BARCODE_ISBNX, -1, EANUPC_GUARD_WHITESPACE, "9784567890120+12345", 0, 50, 1, 149, 330, 116, 102 /*text_row*/, 0, 22, 6, 304, 26 }, /* ISBNX + EAN-5 */ /* 30*/ { BARCODE_ISBNX, 0, EANUPC_GUARD_WHITESPACE, "9784567890120+12345", 0, 50, 1, 149, 330, 110, 102 /*text_row*/, 0, 22, 6, 304, 26 }, /* ISBNX + EAN-5 */ /* 31*/ { BARCODE_ISBNX, 1 /*empty*/, -1, "9784567890120+12345", 0, 50, 1, 149, 330, 116, 6 /*text_row*/, 304, 26, -1, -1, -1 }, /* ISBNX + EAN-5 */ /* 32*/ { BARCODE_EAN8, -1, -1, "123456", 0, 50, 1, 67, 162, 116, 106 /*text_row*/, 20, 58, -1, -1, -1 }, /* 33*/ { BARCODE_EANX, -1, -1, "123456", 0, 50, 1, 67, 162, 116, 106 /*text_row*/, 20, 58, -1, -1, -1 }, /* EAN-8 */ - /* 34*/ { BARCODE_EAN8, -1, BARCODE_RAW_TEXT, "123456", 0, 50, 1, 67, 162, 116, 106 /*text_row*/, 20, 58, -1, -1, -1 }, - /* 35*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "123456", 0, 50, 1, 67, 162, 116, 106 /*text_row*/, 20, 58, -1, -1, -1 }, /* EAN-8 */ + /* 34*/ { BARCODE_EAN8, -1, BARCODE_CONTENT_SEGS, "123456", 0, 50, 1, 67, 162, 116, 106 /*text_row*/, 20, 58, -1, -1, -1 }, + /* 35*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "123456", 0, 50, 1, 67, 162, 116, 106 /*text_row*/, 20, 58, -1, -1, -1 }, /* EAN-8 */ /* 36*/ { BARCODE_EAN8, 0, -1, "123456", 0, 50, 1, 67, 162, 110, 106 /*text_row*/, 20, 58, -1, -1, -1 }, /* 37*/ { BARCODE_EANX, 0, -1, "123456", 0, 50, 1, 67, 162, 110, 106 /*text_row*/, 20, 58, -1, -1, -1 }, /* EAN-8 */ /* 38*/ { BARCODE_EAN8, -1, EANUPC_GUARD_WHITESPACE, "123456", 0, 50, 1, 67, 162, 116, 106 /*text_row*/, 0, 14, 106, 148, 14 }, @@ -555,8 +555,8 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { /* 43*/ { BARCODE_EANX, 1 /*empty*/, -1, "123456", 0, 50, 1, 67, 162, 116, 106 /*text_row*/, 0, 14, 106, 148, 14 }, /* EAN-8 */ /* 44*/ { BARCODE_EAN8, -1, -1, "123456+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 116, 106 /*text_row*/, 20, 58, 5, 148, 68 }, /* 45*/ { BARCODE_EANX, -1, -1, "123456+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 116, 106 /*text_row*/, 20, 58, 5, 148, 68 }, /* EAN-8 + EAN-2 */ - /* 46*/ { BARCODE_EAN8, -1, BARCODE_RAW_TEXT, "123456+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 116, 106 /*text_row*/, 20, 58, 5, 148, 68 }, - /* 47*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "123456+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 116, 106 /*text_row*/, 20, 58, 5, 148, 68 }, /* EAN-8 + EAN-2 */ + /* 46*/ { BARCODE_EAN8, -1, BARCODE_CONTENT_SEGS, "123456+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 116, 106 /*text_row*/, 20, 58, 5, 148, 68 }, + /* 47*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "123456+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 116, 106 /*text_row*/, 20, 58, 5, 148, 68 }, /* EAN-8 + EAN-2 */ /* 48*/ { BARCODE_EAN8, 0, -1, "123456+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 110, 106 /*text_row*/, 20, 58, 5, 148, 68 }, /* 49*/ { BARCODE_EANX, 0, -1, "123456+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 110, 106 /*text_row*/, 20, 58, 5, 148, 68 }, /* EAN-8 + EAN-2 */ /* 50*/ { BARCODE_EAN8, -1, EANUPC_GUARD_WHITESPACE, "123456+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 116, 106 /*text_row*/, 0, 14, 6, 202, 8 }, @@ -567,8 +567,8 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { /* 55*/ { BARCODE_EANX, 1 /*empty*/, -1, "123456+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 116, 106 /*text_row*/, 0, 14, 6, 202, 8 }, /* EAN-8 + EAN-2 */ /* 56*/ { BARCODE_EAN8, -1, -1, "123456+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 116, 106 /*text_row*/, 20, 58, 5, 148, 122 }, /* 57*/ { BARCODE_EANX, -1, -1, "123456+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 116, 106 /*text_row*/, 20, 58, 5, 148, 122 }, /* EAN-8 + EAN-5 */ - /* 58*/ { BARCODE_EAN8, -1, BARCODE_RAW_TEXT, "123456+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 116, 106 /*text_row*/, 20, 58, 5, 148, 122 }, - /* 59*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "123456+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 116, 106 /*text_row*/, 20, 58, 5, 148, 122 }, /* EAN-8 + EAN-5 */ + /* 58*/ { BARCODE_EAN8, -1, BARCODE_CONTENT_SEGS, "123456+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 116, 106 /*text_row*/, 20, 58, 5, 148, 122 }, + /* 59*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "123456+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 116, 106 /*text_row*/, 20, 58, 5, 148, 122 }, /* EAN-8 + EAN-5 */ /* 60*/ { BARCODE_EAN8, 0, -1, "123456+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 110, 106 /*text_row*/, 20, 58, 5, 148, 122 }, /* 61*/ { BARCODE_EANX, 0, -1, "123456+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 110, 106 /*text_row*/, 20, 58, 5, 148, 122 }, /* EAN-8 + EAN-5 */ /* 62*/ { BARCODE_EAN8, -1, EANUPC_GUARD_WHITESPACE, "123456+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 116, 106 /*text_row*/, 0, 14, 6, 256, 10 }, @@ -579,8 +579,8 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { /* 67*/ { BARCODE_EANX, 1 /*empty*/, -1, "123456+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 116, 106 /*text_row*/, 0, 14, 6, 256, 10 }, /* EAN-8 + EAN-5 */ /* 68*/ { BARCODE_EAN_5ADDON, -1, -1, "1234", 0, 50, 1, 47, 104, 116, 0 /*text_row*/, 18, 5, -1, -1, -1 }, /* 69*/ { BARCODE_EANX, -1, -1, "1234", 0, 50, 1, 47, 104, 116, 0 /*text_row*/, 18, 5, -1, -1, -1 }, /* EAN-5 */ - /* 70*/ { BARCODE_EAN_5ADDON, -1, BARCODE_RAW_TEXT, "1234", 0, 50, 1, 47, 104, 116, 0 /*text_row*/, 18, 5, -1, -1, -1 }, - /* 71*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "1234", 0, 50, 1, 47, 104, 116, 0 /*text_row*/, 18, 5, -1, -1, -1 }, /* EAN-5 */ + /* 70*/ { BARCODE_EAN_5ADDON, -1, BARCODE_CONTENT_SEGS, "1234", 0, 50, 1, 47, 104, 116, 0 /*text_row*/, 18, 5, -1, -1, -1 }, + /* 71*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "1234", 0, 50, 1, 47, 104, 116, 0 /*text_row*/, 18, 5, -1, -1, -1 }, /* EAN-5 */ /* 72*/ { BARCODE_EAN_5ADDON, 0, -1, "1234", 0, 50, 1, 47, 104, 100, -1 /*text_row*/, -1, -1, -1, -1, -1 }, /* 73*/ { BARCODE_EANX, 0, -1, "1234", 0, 50, 1, 47, 104, 100, -1 /*text_row*/, -1, -1, -1, -1, -1 }, /* EAN-5 */ /* 74*/ { BARCODE_EAN_5ADDON, -1, EANUPC_GUARD_WHITESPACE, "1234", 0, 50, 1, 47, 104, 116, 6 /*text_row*/, 94, 10, -1, -1, -1 }, @@ -591,8 +591,8 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { /* 79*/ { BARCODE_EANX, 1 /*empty*/, -1, "1234", 0, 50, 1, 47, 104, 116, 6 /*text_row*/, 94, 10, -1, -1, -1 }, /* EAN-5 */ /* 80*/ { BARCODE_EAN_2ADDON, -1, -1, "12", 0, 50, 1, 20, 50, 116, 0 /*text_row*/, 14, 2, -1, -1, -1 }, /* 81*/ { BARCODE_EANX, -1, -1, "12", 0, 50, 1, 20, 50, 116, 0 /*text_row*/, 14, 2, -1, -1, -1 }, /* EAN-2 */ - /* 82*/ { BARCODE_EAN_2ADDON, -1, BARCODE_RAW_TEXT, "12", 0, 50, 1, 20, 50, 116, 0 /*text_row*/, 14, 2, -1, -1, -1 }, - /* 83*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "12", 0, 50, 1, 20, 50, 116, 0 /*text_row*/, 14, 2, -1, -1, -1 }, /* EAN-2 */ + /* 82*/ { BARCODE_EAN_2ADDON, -1, BARCODE_CONTENT_SEGS, "12", 0, 50, 1, 20, 50, 116, 0 /*text_row*/, 14, 2, -1, -1, -1 }, + /* 83*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "12", 0, 50, 1, 20, 50, 116, 0 /*text_row*/, 14, 2, -1, -1, -1 }, /* EAN-2 */ /* 84*/ { BARCODE_EAN_2ADDON, 0, -1, "12", 0, 50, 1, 20, 50, 100, -1 /*text_row*/, -1, -1, -1, -1, -1 }, /* 85*/ { BARCODE_EANX, 0, -1, "12", 0, 50, 1, 20, 50, 100, -1 /*text_row*/, -1, -1, -1, -1, -1 }, /* EAN-2 */ /* 86*/ { BARCODE_EAN_2ADDON, -1, EANUPC_GUARD_WHITESPACE, "12", 0, 50, 1, 20, 50, 116, 6 /*text_row*/, 40, 10, -1, -1, -1 }, @@ -602,31 +602,31 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { /* 90*/ { BARCODE_EAN_2ADDON, 1 /*empty*/, -1, "12", 0, 50, 1, 20, 50, 116, 6 /*text_row*/, 40, 10, -1, -1, -1 }, /* 91*/ { BARCODE_EANX, 1 /*empty*/, -1, "12", 0, 50, 1, 20, 50, 116, 6 /*text_row*/, 40, 10, -1, -1, -1 }, /* EAN-2 */ /* 92*/ { BARCODE_UPCA, -1, -1, "123456789012", 0, 50, 1, 95, 226, 116, 104 /*text_row*/, 0, 18, -1, -1, -1 }, - /* 93*/ { BARCODE_UPCA, -1, BARCODE_RAW_TEXT, "123456789012", 0, 50, 1, 95, 226, 116, 104 /*text_row*/, 0, 18, -1, -1, -1 }, + /* 93*/ { BARCODE_UPCA, -1, BARCODE_CONTENT_SEGS, "123456789012", 0, 50, 1, 95, 226, 116, 104 /*text_row*/, 0, 18, -1, -1, -1 }, /* 94*/ { BARCODE_UPCA, 0, -1, "123456789012", 0, 50, 1, 95, 226, 110, 104 /*text_row*/, 0, 18, -1, -1, -1 }, /* 95*/ { BARCODE_UPCA, -1, -1, "123456789012+12", 0, 50, 1, 124, 276, 116, 104 /*text_row*/, 0, 18, 5, 208, 68 }, - /* 96*/ { BARCODE_UPCA, -1, BARCODE_RAW_TEXT, "123456789012+12", 0, 50, 1, 124, 276, 116, 104 /*text_row*/, 0, 18, 5, 208, 68 }, + /* 96*/ { BARCODE_UPCA, -1, BARCODE_CONTENT_SEGS, "123456789012+12", 0, 50, 1, 124, 276, 116, 104 /*text_row*/, 0, 18, 5, 208, 68 }, /* 97*/ { BARCODE_UPCA, 0, -1, "123456789012+12", 0, 50, 1, 124, 276, 110, 104 /*text_row*/, 0, 18, 5, 208, 68 }, /* 98*/ { BARCODE_UPCA, -1, EANUPC_GUARD_WHITESPACE, "123456789012+12", 0, 50, 1, 124, 276, 116, 104 /*text_row*/, 0, 18, 5, 266, 10 }, /* 99*/ { BARCODE_UPCA, 0, EANUPC_GUARD_WHITESPACE, "123456789012+12", 0, 50, 1, 124, 276, 110, 104 /*text_row*/, 0, 18, 5, 266, 10 }, /*100*/ { BARCODE_UPCA, 1 /*empty*/, -1, "123456789012+12", 0, 50, 1, 124, 276, 116, 5 /*text_row*/, 266, 10, -1, -1, -1 }, /*101*/ { BARCODE_UPCA_CHK, -1, -1, "123456789012+12345", 0, 50, 1, 151, 330, 116, 104 /*text_row*/, 0, 18, 5, 208, 122 }, - /*102*/ { BARCODE_UPCA_CHK, -1, BARCODE_RAW_TEXT, "123456789012+12345", 0, 50, 1, 151, 330, 116, 104 /*text_row*/, 0, 18, 5, 208, 122 }, + /*102*/ { BARCODE_UPCA_CHK, -1, BARCODE_CONTENT_SEGS, "123456789012+12345", 0, 50, 1, 151, 330, 116, 104 /*text_row*/, 0, 18, 5, 208, 122 }, /*103*/ { BARCODE_UPCA_CHK, 0, -1, "123456789012+12345", 0, 50, 1, 151, 330, 110, 104 /*text_row*/, 0, 18, 5, 208, 122 }, /*104*/ { BARCODE_UPCA_CHK, -1, EANUPC_GUARD_WHITESPACE, "123456789012+12345", 0, 50, 1, 151, 330, 116, 104 /*text_row*/, 0, 18, 6, 320, 10 }, /*105*/ { BARCODE_UPCA_CHK, 0, EANUPC_GUARD_WHITESPACE, "123456789012+12345", 0, 50, 1, 151, 330, 110, 104 /*text_row*/, 0, 18, 6, 320, 10 }, /*106*/ { BARCODE_UPCA_CHK, 1 /*empty*/, -1, "123456789012+12345", 0, 50, 1, 151, 330, 116, 6 /*text_row*/, 320, 10, -1, -1, -1 }, /*107*/ { BARCODE_UPCE, -1, -1, "1234567", 0, 50, 1, 51, 134, 116, 104 /*text_row*/, 0, 18, -1, -1, -1 }, - /*108*/ { BARCODE_UPCE, -1, BARCODE_RAW_TEXT, "1234567", 0, 50, 1, 51, 134, 116, 104 /*text_row*/, 0, 18, -1, -1, -1 }, + /*108*/ { BARCODE_UPCE, -1, BARCODE_CONTENT_SEGS, "1234567", 0, 50, 1, 51, 134, 116, 104 /*text_row*/, 0, 18, -1, -1, -1 }, /*109*/ { BARCODE_UPCE, 0, -1, "1234567", 0, 50, 1, 51, 134, 110, 104 /*text_row*/, 0, 18, -1, -1, -1 }, /*110*/ { BARCODE_UPCE_CHK, -1, -1, "12345670+12", 0, 50, 1, 78, 184, 116, 104 /*text_row*/, 0, 18, 5, 120, 64 }, - /*111*/ { BARCODE_UPCE_CHK, -1, BARCODE_RAW_TEXT, "12345670+12", 0, 50, 1, 78, 184, 116, 104 /*text_row*/, 0, 18, 5, 120, 64 }, + /*111*/ { BARCODE_UPCE_CHK, -1, BARCODE_CONTENT_SEGS, "12345670+12", 0, 50, 1, 78, 184, 116, 104 /*text_row*/, 0, 18, 5, 120, 64 }, /*112*/ { BARCODE_UPCE_CHK, 0, -1, "12345670+12", 0, 50, 1, 78, 184, 110, 104 /*text_row*/, 0, 18, 5, 120, 64 }, /*113*/ { BARCODE_UPCE_CHK, -1, EANUPC_GUARD_WHITESPACE, "12345670+12", 0, 50, 1, 78, 184, 116, 104 /*text_row*/, 0, 18, 6, 174, 10 }, /*114*/ { BARCODE_UPCE_CHK, 0, EANUPC_GUARD_WHITESPACE, "12345670+12", 0, 50, 1, 78, 184, 110, 104 /*text_row*/, 0, 18, 6, 174, 10 }, /*115*/ { BARCODE_UPCE_CHK, 1 /*empty*/, -1, "12345670+12", 0, 50, 1, 78, 184, 116, 6 /*text_row*/, 174, 10, -1, -1, -1 }, /*116*/ { BARCODE_UPCE, -1, -1, "1234567+12345", 0, 50, 1, 105, 238, 116, 104 /*text_row*/, 0, 18, 5, 120, 118 }, - /*117*/ { BARCODE_UPCE, -1, BARCODE_RAW_TEXT, "1234567+12345", 0, 50, 1, 105, 238, 116, 104 /*text_row*/, 0, 18, 5, 120, 118 }, + /*117*/ { BARCODE_UPCE, -1, BARCODE_CONTENT_SEGS, "1234567+12345", 0, 50, 1, 105, 238, 116, 104 /*text_row*/, 0, 18, 5, 120, 118 }, /*118*/ { BARCODE_UPCE, 0, -1, "1234567+12345", 0, 50, 1, 105, 238, 110, 104 /*text_row*/, 0, 18, 5, 120, 118 }, /*119*/ { BARCODE_UPCE, -1, EANUPC_GUARD_WHITESPACE, "1234567+12345", 0, 50, 1, 105, 238, 116, 104 /*text_row*/, 0, 18, 6, 228, 10 }, /*120*/ { BARCODE_UPCE, 0, EANUPC_GUARD_WHITESPACE, "1234567+12345", 0, 50, 1, 105, 238, 110, 104 /*text_row*/, 0, 18, 6, 228, 10 }, @@ -1123,7 +1123,7 @@ static void test_output_options(const testCtx *const p_ctx) { testFinish(); } -static void test_draw_string_wrap(const testCtx *const p_ctx) { +static void test_dcontent_string_wrap(const testCtx *const p_ctx) { int debug = p_ctx->debug; struct item { @@ -3304,7 +3304,7 @@ static void test_height_per_row(const testCtx *const p_ctx) { testFinish(); } -static void test_hrt_raw_text(const testCtx *const p_ctx) { +static void test_hrt_content_segs(const testCtx *const p_ctx) { int debug = p_ctx->debug; struct item { @@ -3320,38 +3320,38 @@ static void test_hrt_raw_text(const testCtx *const p_ctx) { int expected_bitmap_width; const char *expected; int expected_length; - const char *expected_raw; - int expected_raw_length; + const char *expected_content; + int expected_content_length; const char *expected_errtxt; }; static const struct item data[] = { /* 0*/ { BARCODE_CODE128, -1, -1, BARCODE_MEMORY_FILE, "12345\00067890", 11, 0, 116, 268, "12345 67890", -1, "", -1, "" }, - /* 1*/ { BARCODE_CODE128, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "12345\00067890", 11, 0, 116, 268, "12345 67890", -1, "12345\00067890", 11, "" }, + /* 1*/ { BARCODE_CODE128, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "12345\00067890", 11, 0, 116, 268, "12345 67890", -1, "12345\00067890", 11, "" }, /* 2*/ { BARCODE_EXCODE39, -1, -1, BARCODE_MEMORY_FILE, "12345\00067890", 11, 0, 116, 362, "12345 67890", -1, "", -1, "" }, - /* 3*/ { BARCODE_EXCODE39, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "12345\00067890", 11, 0, 116, 362, "12345 67890", -1, "12345\00067890", 11, "" }, + /* 3*/ { BARCODE_EXCODE39, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "12345\00067890", 11, 0, 116, 362, "12345 67890", -1, "12345\00067890", 11, "" }, /* 4*/ { BARCODE_TELEPEN, -1, -1, BARCODE_MEMORY_FILE, "12345\00067890", 11, 0, 116, 448, "12345 67890", -1, "", -1, "" }, - /* 5*/ { BARCODE_TELEPEN, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "12345\00067890", 11, 0, 116, 448, "12345 67890", -1, "12345\00067890n", 12, "" }, + /* 5*/ { BARCODE_TELEPEN, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "12345\00067890", 11, 0, 116, 448, "12345 67890", -1, "12345\00067890n", 12, "" }, /* 6*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE, "123456789012", -1, 0, 116, 226, "1234567890128", -1, "", -1, "" }, /* 7*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE, "123456789012", -1, 0, 116, 226, "1234567890128", -1, "", -1, "" }, - /* 8*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "123456789012", -1, 0, 116, 226, "1234567890128", -1, "1234567890128", -1, "" }, - /* 9*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "123456789012", -1, 0, 116, 226, "1234567890128", -1, "1234567890128", -1, "" }, + /* 8*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "123456789012", -1, 0, 116, 226, "1234567890128", -1, "1234567890128", -1, "" }, + /* 9*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "123456789012", -1, 0, 116, 226, "1234567890128", -1, "1234567890128", -1, "" }, /* 10*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE, "123456789012+12", -1, 0, 116, 276, "1234567890128+12", -1, "", -1, "" }, /* 11*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE, "123456789012+12", -1, 0, 116, 276, "1234567890128+12", -1, "", -1, "" }, - /* 12*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "123456789012+12", -1, 0, 116, 276, "1234567890128+12", -1, "123456789012812", -1, "" }, - /* 13*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "123456789012+12", -1, 0, 116, 276, "1234567890128+12", -1, "123456789012812", -1, "" }, + /* 12*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "123456789012+12", -1, 0, 116, 276, "1234567890128+12", -1, "123456789012812", -1, "" }, + /* 13*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "123456789012+12", -1, 0, 116, 276, "1234567890128+12", -1, "123456789012812", -1, "" }, /* 14*/ { BARCODE_CODE39, -1, -1, BARCODE_MEMORY_FILE, "ABC14", -1, 0, 116, 180, "*ABC14*", -1, "", -1, "" }, - /* 15*/ { BARCODE_CODE39, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "ABC14", -1, 0, 116, 180, "*ABC14*", -1, "ABC14", -1, "" }, + /* 15*/ { BARCODE_CODE39, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "ABC14", -1, 0, 116, 180, "*ABC14*", -1, "ABC14", -1, "" }, /* 16*/ { BARCODE_CODE39, -1, 1, BARCODE_MEMORY_FILE, "ABC14", -1, 0, 116, 206, "*ABC14_*", -1, "", -1, "" }, /* Check digit space rendered as underscore */ - /* 17*/ { BARCODE_CODE39, -1, 1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "ABC14", -1, 0, 116, 206, "*ABC14_*", -1, "ABC14 ", -1, "" }, + /* 17*/ { BARCODE_CODE39, -1, 1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "ABC14", -1, 0, 116, 206, "*ABC14_*", -1, "ABC14 ", -1, "" }, /* 18*/ { BARCODE_POSTNET, -1, -1, BARCODE_MEMORY_FILE, "12345", -1, 0, 24, 126, "", -1, "", -1, "" }, - /* 19*/ { BARCODE_POSTNET, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "12345", -1, 0, 24, 126, "", -1, "123455", -1, "" }, /* HRT not printed */ + /* 19*/ { BARCODE_POSTNET, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "12345", -1, 0, 24, 126, "", -1, "123455", -1, "" }, /* HRT not printed */ /* 20*/ { BARCODE_POSTNET, 0, -1, BARCODE_MEMORY_FILE, "12345", -1, 0, 24, 126, "", -1, "", -1, "" }, - /* 21*/ { BARCODE_POSTNET, 0, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "12345", -1, 0, 24, 126, "", -1, "123455", -1, "" }, /* HRT not printed */ + /* 21*/ { BARCODE_POSTNET, 0, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "12345", -1, 0, 24, 126, "", -1, "123455", -1, "" }, /* HRT not printed */ }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -3370,7 +3370,7 @@ static void test_hrt_raw_text(const testCtx *const p_ctx) { -1 /*option_1*/, data[i].option_2, -1 /*option_3*/, data[i].output_options, data[i].data, data[i].length, debug); expected_length = data[i].expected_length == -1 ? (int) strlen(data[i].expected) : data[i].expected_length; - expected_raw_length = data[i].expected_raw_length == -1 ? (int) strlen(data[i].expected_raw) : data[i].expected_raw_length; + expected_content_length = data[i].expected_content_length == -1 ? (int) strlen(data[i].expected_content) : data[i].expected_content_length; ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode(%s) ret %d != 0 (%s)\n", @@ -3380,18 +3380,18 @@ static void test_hrt_raw_text(const testCtx *const p_ctx) { i, symbol->text_length, expected_length, symbol->text); assert_zero(memcmp(symbol->text, data[i].expected, expected_length), "i:%d memcmp(%s, %s, %d) != 0\n", i, symbol->text, data[i].expected, expected_length); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %.*s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, expected_raw_length, - data[i].expected_raw, expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, expected_content_length, + data[i].expected_content, expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ret = ZBarcode_Print(symbol, 0); @@ -3540,7 +3540,7 @@ int main(int argc, char *argv[]) { { "test_stacking", test_stacking }, { "test_stacking_too_many", test_stacking_too_many }, { "test_output_options", test_output_options }, - { "test_draw_string_wrap", test_draw_string_wrap }, + { "test_dcontent_string_wrap", test_dcontent_string_wrap }, { "test_code128_utf8", test_code128_utf8 }, { "test_scale", test_scale }, { "test_guard_descent", test_guard_descent }, @@ -3549,7 +3549,7 @@ int main(int argc, char *argv[]) { { "test_buffer_plot", test_buffer_plot }, { "test_height", test_height }, { "test_height_per_row", test_height_per_row }, - { "test_hrt_raw_text", test_hrt_raw_text }, + { "test_hrt_content_segs", test_hrt_content_segs }, { "test_perf_scale", test_perf_scale }, }; diff --git a/backend/tests/test_rss.c b/backend/tests/test_rss.c index 20086622..86c7fbb6 100644 --- a/backend/tests/test_rss.c +++ b/backend/tests/test_rss.c @@ -1316,33 +1316,33 @@ static void test_hrt(const testCtx *const p_ctx) { int ret; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_DBAR_OMN, -1, "1234567890123", 0, "(01)12345678901231", "" }, - /* 1*/ { BARCODE_DBAR_OMN, BARCODE_RAW_TEXT, "1234567890123", 0, "(01)12345678901231", "0112345678901231" }, + /* 1*/ { BARCODE_DBAR_OMN, BARCODE_CONTENT_SEGS, "1234567890123", 0, "(01)12345678901231", "0112345678901231" }, /* 2*/ { BARCODE_DBAR_OMN, -1, "12345678901231", 0, "(01)12345678901231", "" }, - /* 3*/ { BARCODE_DBAR_OMN, BARCODE_RAW_TEXT, "12345678901231", 0, "(01)12345678901231", "0112345678901231" }, + /* 3*/ { BARCODE_DBAR_OMN, BARCODE_CONTENT_SEGS, "12345678901231", 0, "(01)12345678901231", "0112345678901231" }, /* 4*/ { BARCODE_DBAR_OMN, -1, "1000000000009", 0, "(01)10000000000090", "" }, - /* 5*/ { BARCODE_DBAR_OMN, BARCODE_RAW_TEXT, "1000000000009", 0, "(01)10000000000090", "0110000000000090" }, + /* 5*/ { BARCODE_DBAR_OMN, BARCODE_CONTENT_SEGS, "1000000000009", 0, "(01)10000000000090", "0110000000000090" }, /* 6*/ { BARCODE_DBAR_LTD, -1, "1341056790138", 0, "(01)13410567901384", "" }, - /* 7*/ { BARCODE_DBAR_LTD, BARCODE_RAW_TEXT, "1341056790138", 0, "(01)13410567901384", "0113410567901384" }, + /* 7*/ { BARCODE_DBAR_LTD, BARCODE_CONTENT_SEGS, "1341056790138", 0, "(01)13410567901384", "0113410567901384" }, /* 8*/ { BARCODE_DBAR_LTD, -1, "13410567901384", 0, "(01)13410567901384", "" }, - /* 9*/ { BARCODE_DBAR_LTD, BARCODE_RAW_TEXT, "13410567901384", 0, "(01)13410567901384", "0113410567901384" }, + /* 9*/ { BARCODE_DBAR_LTD, BARCODE_CONTENT_SEGS, "13410567901384", 0, "(01)13410567901384", "0113410567901384" }, /* 10*/ { BARCODE_DBAR_EXP, -1, "[01]12345678901231", 0, "(01)12345678901231", "" }, /* See test_hrt() in "test_gs1.c" for full HRT tests */ - /* 11*/ { BARCODE_DBAR_EXP, BARCODE_RAW_TEXT, "[01]12345678901231", 0, "(01)12345678901231", "0112345678901231" }, + /* 11*/ { BARCODE_DBAR_EXP, BARCODE_CONTENT_SEGS, "[01]12345678901231", 0, "(01)12345678901231", "0112345678901231" }, /* 12*/ { BARCODE_DBAR_STK, -1, "12345678901231", 0, "", "" }, /* No HRT for stacked */ - /* 13*/ { BARCODE_DBAR_STK, BARCODE_RAW_TEXT, "12345678901231", 0, "", "0112345678901231" }, /* But have RAW_TEXT */ + /* 13*/ { BARCODE_DBAR_STK, BARCODE_CONTENT_SEGS, "12345678901231", 0, "", "0112345678901231" }, /* But have content segs */ /* 14*/ { BARCODE_DBAR_OMNSTK, -1, "10000000000090", 0, "", "" }, - /* 15*/ { BARCODE_DBAR_OMNSTK, BARCODE_RAW_TEXT, "10000000000090", 0, "", "0110000000000090" }, + /* 15*/ { BARCODE_DBAR_OMNSTK, BARCODE_CONTENT_SEGS, "10000000000090", 0, "", "0110000000000090" }, /* 16*/ { BARCODE_DBAR_EXPSTK, -1, "[01]12345678901231", 0, "", "" }, - /* 17*/ { BARCODE_DBAR_EXPSTK, BARCODE_RAW_TEXT, "[01]12345678901231", 0, "", "0112345678901231" }, + /* 17*/ { BARCODE_DBAR_EXPSTK, BARCODE_CONTENT_SEGS, "[01]12345678901231", 0, "", "0112345678901231" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -1357,7 +1357,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_equal(ret, data[i].ret, "i:%d ZBarcode_Encode ret %d != %d (%s)\n", i, data[i].ret, ret, symbol->errtxt); @@ -1366,18 +1366,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((const char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_telepen.c b/backend/tests/test_telepen.c index 868b7570..59684174 100644 --- a/backend/tests/test_telepen.c +++ b/backend/tests/test_telepen.c @@ -97,34 +97,34 @@ static void test_hrt(const testCtx *const p_ctx) { const char *expected; int expected_length; - const char *expected_raw; - int expected_raw_length; + const char *expected_content; + int expected_content_length; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_TELEPEN, -1, "ABC1234.;$", -1, "ABC1234.;$", -1, "", -1 }, - /* 1*/ { BARCODE_TELEPEN, BARCODE_RAW_TEXT, "ABC1234.;$", -1, "ABC1234.;$", -1, "ABC1234.;$^", -1 }, + /* 1*/ { BARCODE_TELEPEN, BARCODE_CONTENT_SEGS, "ABC1234.;$", -1, "ABC1234.;$", -1, "ABC1234.;$^", -1 }, /* 2*/ { BARCODE_TELEPEN, -1, "abc1234.;$", -1, "abc1234.;$", -1, "", -1 }, - /* 3*/ { BARCODE_TELEPEN, BARCODE_RAW_TEXT, "abc1234.;$", -1, "abc1234.;$", -1, "abc1234.;$}", -1 }, + /* 3*/ { BARCODE_TELEPEN, BARCODE_CONTENT_SEGS, "abc1234.;$", -1, "abc1234.;$", -1, "abc1234.;$}", -1 }, /* 4*/ { BARCODE_TELEPEN, -1, "ABC1234\001", -1, "ABC1234 ", -1, "", -1 }, /* Note used to put control chars (apart from NUL) in HRT */ - /* 5*/ { BARCODE_TELEPEN, BARCODE_RAW_TEXT, "ABC1234\001", -1, "ABC1234 ", -1, "ABC1234\001k", -1 }, + /* 5*/ { BARCODE_TELEPEN, BARCODE_CONTENT_SEGS, "ABC1234\001", -1, "ABC1234 ", -1, "ABC1234\001k", -1 }, /* 6*/ { BARCODE_TELEPEN, -1, "ABC\0001234", 8, "ABC 1234", -1, "", -1 }, - /* 7*/ { BARCODE_TELEPEN, BARCODE_RAW_TEXT, "ABC\0001234", 8, "ABC 1234", -1, "ABC\0001234l", 9 }, + /* 7*/ { BARCODE_TELEPEN, BARCODE_CONTENT_SEGS, "ABC\0001234", 8, "ABC 1234", -1, "ABC\0001234l", 9 }, /* 8*/ { BARCODE_TELEPEN, -1, "ABK0", -1, "ABK0", -1, "", -1 }, - /* 9*/ { BARCODE_TELEPEN, BARCODE_RAW_TEXT, "ABK0", -1, "ABK0", -1, "ABK0\000", 5 }, + /* 9*/ { BARCODE_TELEPEN, BARCODE_CONTENT_SEGS, "ABK0", -1, "ABK0", -1, "ABK0\000", 5 }, /* 10*/ { BARCODE_TELEPEN_NUM, -1, "1234", -1, "1234", -1, "", -1 }, - /* 11*/ { BARCODE_TELEPEN_NUM, BARCODE_RAW_TEXT, "1234", -1, "1234", -1, "1234\033", -1 }, + /* 11*/ { BARCODE_TELEPEN_NUM, BARCODE_CONTENT_SEGS, "1234", -1, "1234", -1, "1234\033", -1 }, /* 12*/ { BARCODE_TELEPEN_NUM, -1, "123X", -1, "123X", -1, "", -1 }, - /* 13*/ { BARCODE_TELEPEN_NUM, BARCODE_RAW_TEXT, "123X", -1, "123X", -1, "123XD", -1 }, + /* 13*/ { BARCODE_TELEPEN_NUM, BARCODE_CONTENT_SEGS, "123X", -1, "123X", -1, "123XD", -1 }, /* 14*/ { BARCODE_TELEPEN_NUM, -1, "123x", -1, "123X", -1, "", -1 }, /* Converts to upper */ - /* 15*/ { BARCODE_TELEPEN_NUM, BARCODE_RAW_TEXT, "123x", -1, "123X", -1, "123XD", -1 }, + /* 15*/ { BARCODE_TELEPEN_NUM, BARCODE_CONTENT_SEGS, "123x", -1, "123X", -1, "123XD", -1 }, /* 16*/ { BARCODE_TELEPEN_NUM, -1, "12345", -1, "012345", -1, "", -1 }, /* Adds leading zero if odd */ - /* 17*/ { BARCODE_TELEPEN_NUM, BARCODE_RAW_TEXT, "12345", -1, "012345", -1, "012345h", -1 }, + /* 17*/ { BARCODE_TELEPEN_NUM, BARCODE_CONTENT_SEGS, "12345", -1, "012345", -1, "012345h", -1 }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -139,7 +139,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, data[i].output_options, data[i].data, data[i].length, debug); expected_length = data[i].expected_length == -1 ? (int) strlen(data[i].expected) : data[i].expected_length; - expected_raw_length = data[i].expected_raw_length == -1 ? (int) strlen(data[i].expected_raw) : data[i].expected_raw_length; + expected_content_length = data[i].expected_content_length == -1 ? (int) strlen(data[i].expected_content) : data[i].expected_content_length; ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode ret %d != 0 %s\n", i, ret, symbol->errtxt); @@ -148,18 +148,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(memcmp(symbol->text, data[i].expected, expected_length), "i:%d memcmp(%s, %s, %d) != 0\n", i, symbol->text, data[i].expected, expected_length); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %.*s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, expected_raw_length, - data[i].expected_raw, expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, expected_content_length, + data[i].expected_content, expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_ultra.c b/backend/tests/test_ultra.c index 0926ddb6..452fdd03 100644 --- a/backend/tests/test_ultra.c +++ b/backend/tests/test_ultra.c @@ -1135,23 +1135,23 @@ static void test_rt(const testCtx *const p_ctx) { int expected_eci; const char *expected; int expected_length; - int expected_raw_eci; + int expected_content_eci; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, -1, "é", -1, 0, 0, "", -1, 0 }, - /* 1*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "é", -1, 0, 0, "é", -1, 3 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, -1, "ก", -1, ZINT_WARN_USES_ECI, 13, "", -1, 0 }, - /* 3*/ { UNICODE_MODE, -1, BARCODE_RAW_TEXT, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, + /* 3*/ { UNICODE_MODE, -1, BARCODE_CONTENT_SEGS, "ก", -1, ZINT_WARN_USES_ECI, 13, "ก", -1, 13 }, /* 4*/ { DATA_MODE, -1, -1, "\351", -1, 0, 0, "", -1, 0 }, - /* 5*/ { DATA_MODE, -1, BARCODE_RAW_TEXT, "\351", -1, 0, 0, "\351", -1, 3 }, + /* 5*/ { DATA_MODE, -1, BARCODE_CONTENT_SEGS, "\351", -1, 0, 0, "\351", -1, 3 }, /* 6*/ { UNICODE_MODE, 26, -1, "é", -1, 0, 26, "", -1, 0 }, - /* 7*/ { UNICODE_MODE, 26, BARCODE_RAW_TEXT, "é", -1, 0, 26, "é", -1, 26 }, + /* 7*/ { UNICODE_MODE, 26, BARCODE_CONTENT_SEGS, "é", -1, 0, 26, "é", -1, 26 }, /* 8*/ { UNICODE_MODE, 899, -1, "é", -1, 0, 899, "", -1, 0 }, - /* 9*/ { UNICODE_MODE, 899, BARCODE_RAW_TEXT, "é", -1, 0, 899, "é", -1, 899 }, + /* 9*/ { UNICODE_MODE, 899, BARCODE_CONTENT_SEGS, "é", -1, 0, 899, "é", -1, 899 }, /* 10*/ { GS1_MODE, -1, -1, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "", -1, 0 }, - /* 11*/ { GS1_MODE, -1, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, - /* 12*/ { GS1_MODE, 27, BARCODE_RAW_TEXT, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 27, "01049123451234591597033130128\03510ABC123", -1, 3 }, /* Note: raw text ECI remains at default 3 */ + /* 11*/ { GS1_MODE, -1, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 0, "01049123451234591597033130128\03510ABC123", -1, 3 }, + /* 12*/ { GS1_MODE, 27, BARCODE_CONTENT_SEGS, "[01]04912345123459[15]970331[30]128[10]ABC123", -1, 0, 27, "01049123451234591597033130128\03510ABC123", -1, 3 }, /* Note: raw text ECI remains at default 3 */ }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -1183,23 +1183,23 @@ static void test_rt(const testCtx *const p_ctx) { if (ret < ZINT_ERROR) { assert_equal(symbol->eci, data[i].expected_eci, "i:%d eci %d != %d\n", i, symbol->eci, data[i].expected_eci); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_length, - "i:%d raw_segs[0].length %d != expected_length %d\n", - i, symbol->raw_segs[0].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected, expected_length), - "i:%d raw_segs[0].source memcmp(%s, %s, %d) != 0\n", i, - testUtilEscape((const char *) symbol->raw_segs[0].source, symbol->raw_segs[0].length, + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_length, + "i:%d content_segs[0].length %d != expected_length %d\n", + i, symbol->content_segs[0].length, expected_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected, expected_length), + "i:%d content_segs[0].source memcmp(%s, %s, %d) != 0\n", i, + testUtilEscape((const char *) symbol->content_segs[0].source, symbol->content_segs[0].length, escaped, sizeof(escaped)), testUtilEscape(data[i].expected, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[0].eci, data[i].expected_raw_eci, - "i:%d raw_segs[0].eci %d != expected_raw_eci %d\n", - i, symbol->raw_segs[0].eci, data[i].expected_raw_eci); + assert_equal(symbol->content_segs[0].eci, data[i].expected_content_eci, + "i:%d content_segs[0].eci %d != expected_content_eci %d\n", + i, symbol->content_segs[0].eci, data[i].expected_content_eci); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } } @@ -1220,17 +1220,17 @@ static void test_rt_segs(const testCtx *const p_ctx) { int expected_rows; int expected_width; - struct zint_seg expected_raw_segs[3]; - int expected_raw_seg_count; + struct zint_seg expected_content_segs[3]; + int expected_content_seg_count; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { UNICODE_MODE, -1, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, {0} }, 0, 13, 15, {{0}}, 0 }, - /* 1*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 13, 15, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ + /* 1*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 0 }, { TU("Ж"), -1, 7 }, { TU(""), 0, 0 } }, 0, 13, 15, { { TU("¶"), 2, 3 }, { TU("Ж"), 2, 7 }, {0} }, 2 }, /* Now UTF-8, not converted */ /* 2*/ { UNICODE_MODE, -1, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 13, 20, {{0}}, 0 }, - /* 3*/ { UNICODE_MODE, BARCODE_RAW_TEXT, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 13, 20, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, + /* 3*/ { UNICODE_MODE, BARCODE_CONTENT_SEGS, { { TU("éé"), -1, 0 }, { TU("กขฯ"), -1, 0 }, { TU("βββ"), -1, 0 } }, ZINT_WARN_USES_ECI, 13, 20, { { TU("éé"), 4, 3 }, { TU("กขฯ"), 9, 13 }, { TU("βββ"), 6, 9 } }, 3 }, /* 4*/ { DATA_MODE, -1, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 13, 19, {{0}}, 0 }, - /* 5*/ { DATA_MODE, BARCODE_RAW_TEXT, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 13, 19, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, + /* 5*/ { DATA_MODE, BARCODE_CONTENT_SEGS, { { TU("¶"), -1, 26 }, { TU("Ж"), -1, 0 }, { TU("\223\137"), -1, 20 } }, 0, 13, 19, { { TU("¶"), 2, 26 }, { TU("\320\226"), 2, 3 }, { TU("\223\137"), 2, 20 } }, 3 }, }; const int data_size = ARRAY_SIZE(data); int i, j, seg_count, ret; @@ -1264,31 +1264,31 @@ static void test_rt_segs(const testCtx *const p_ctx) { assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d\n", i, symbol->width, data[i].expected_width); - assert_equal(symbol->raw_seg_count, data[i].expected_raw_seg_count, "i:%d symbol->raw_seg_count %d != %d\n", - i, symbol->raw_seg_count, data[i].expected_raw_seg_count); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - for (j = 0; j < symbol->raw_seg_count; j++) { - assert_nonnull(symbol->raw_segs[j].source, "i:%d raw_segs[%d].source NULL\n", i, j); + assert_equal(symbol->content_seg_count, data[i].expected_content_seg_count, "i:%d symbol->content_seg_count %d != %d\n", + i, symbol->content_seg_count, data[i].expected_content_seg_count); + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + for (j = 0; j < symbol->content_seg_count; j++) { + assert_nonnull(symbol->content_segs[j].source, "i:%d content_segs[%d].source NULL\n", i, j); - expected_length = data[i].expected_raw_segs[j].length; + expected_length = data[i].expected_content_segs[j].length; - assert_equal(symbol->raw_segs[j].length, expected_length, - "i:%d raw_segs[%d].length %d != expected_length %d\n", - i, j, symbol->raw_segs[j].length, expected_length); - assert_zero(memcmp(symbol->raw_segs[j].source, data[i].expected_raw_segs[j].source, expected_length), - "i:%d raw_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, - testUtilEscape((const char *) symbol->raw_segs[j].source, expected_length, escaped, + assert_equal(symbol->content_segs[j].length, expected_length, + "i:%d content_segs[%d].length %d != expected_length %d\n", + i, j, symbol->content_segs[j].length, expected_length); + assert_zero(memcmp(symbol->content_segs[j].source, data[i].expected_content_segs[j].source, expected_length), + "i:%d content_segs[%d].source memcmp(%s, %s, %d) != 0\n", i, j, + testUtilEscape((const char *) symbol->content_segs[j].source, expected_length, escaped, sizeof(escaped)), - testUtilEscape((const char *) data[i].expected_raw_segs[j].source, expected_length, + testUtilEscape((const char *) data[i].expected_content_segs[j].source, expected_length, escaped2, sizeof(escaped2)), expected_length); - assert_equal(symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci, - "i:%d raw_segs[%d].eci %d != expected_raw_segs.eci %d\n", - i, j, symbol->raw_segs[j].eci, data[i].expected_raw_segs[j].eci); + assert_equal(symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci, + "i:%d content_segs[%d].eci %d != expected_content_segs.eci %d\n", + i, j, symbol->content_segs[j].eci, data[i].expected_content_segs[j].eci); } } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_upcean.c b/backend/tests/test_upcean.c index 0c66714e..124dc027 100644 --- a/backend/tests/test_upcean.c +++ b/backend/tests/test_upcean.c @@ -1247,153 +1247,153 @@ static void test_hrt(const testCtx *const p_ctx) { const char *data; int ret; const char *expected; - const char *expected_raw; + const char *expected_content; }; /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */ static const struct item data[] = { /* 0*/ { BARCODE_EAN13, -1, "12345678901", 0, "0123456789012", "" }, /* 1*/ { BARCODE_EANX, -1, "12345678901", 0, "0123456789012", "" }, - /* 2*/ { BARCODE_EAN13, BARCODE_RAW_TEXT, "12345678901", 0, "0123456789012", "0123456789012" }, - /* 3*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "12345678901", 0, "0123456789012", "0123456789012" }, + /* 2*/ { BARCODE_EAN13, BARCODE_CONTENT_SEGS, "12345678901", 0, "0123456789012", "0123456789012" }, + /* 3*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "12345678901", 0, "0123456789012", "0123456789012" }, /* 4*/ { BARCODE_EAN13, -1, "123456789012", 0, "1234567890128", "" }, /* 5*/ { BARCODE_EANX, -1, "123456789012", 0, "1234567890128", "" }, - /* 6*/ { BARCODE_EAN13, BARCODE_RAW_TEXT, "123456789012", 0, "1234567890128", "1234567890128" }, - /* 7*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "123456789012", 0, "1234567890128", "1234567890128" }, + /* 6*/ { BARCODE_EAN13, BARCODE_CONTENT_SEGS, "123456789012", 0, "1234567890128", "1234567890128" }, + /* 7*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "123456789012", 0, "1234567890128", "1234567890128" }, /* 8*/ { BARCODE_EAN13, -1, "1234567890128", 0, "1234567890128", "" }, /* EAN13 accepts CHK (treated as such if no leading zeroes required) */ /* 9*/ { BARCODE_EANX, -1, "1234567890128", 0, "1234567890128", "" }, /* EANX accepts CHK (treated as such if no leading zeroes required) */ /* 10*/ { BARCODE_EAN13, -1, "1234567890128", 0, "1234567890128", "1234567890128" }, /* 11*/ { BARCODE_EANX_CHK, -1, "1234567890128", 0, "1234567890128", "1234567890128" }, - /* 12*/ { BARCODE_EAN13, BARCODE_RAW_TEXT, "1234567890128", 0, "1234567890128", "1234567890128" }, - /* 13*/ { BARCODE_EANX_CHK, BARCODE_RAW_TEXT, "1234567890128", 0, "1234567890128", "1234567890128" }, + /* 12*/ { BARCODE_EAN13, BARCODE_CONTENT_SEGS, "1234567890128", 0, "1234567890128", "1234567890128" }, + /* 13*/ { BARCODE_EANX_CHK, BARCODE_CONTENT_SEGS, "1234567890128", 0, "1234567890128", "1234567890128" }, /* 14*/ { BARCODE_EAN13, -1, "0123456789012", 0, "0123456789012", "0123456789012" }, /* '2' happens to be correct check digit for "012345678901" */ /* 15*/ { BARCODE_EANX_CHK, -1, "123456789012", 0, "0123456789012", "0123456789012" }, /* '2' happens to be correct check digit for "012345678901" */ /* 16*/ { BARCODE_EAN13, -1, "1234567890128+1", 0, "1234567890128+01", "" }, /* 17*/ { BARCODE_EANX, -1, "1234567890128+1", 0, "1234567890128+01", "" }, - /* 18*/ { BARCODE_EAN13, BARCODE_RAW_TEXT, "1234567890128+1", 0, "1234567890128+01", "123456789012801" }, - /* 19*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "1234567890128+1", 0, "1234567890128+01", "123456789012801" }, + /* 18*/ { BARCODE_EAN13, BARCODE_CONTENT_SEGS, "1234567890128+1", 0, "1234567890128+01", "123456789012801" }, + /* 19*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "1234567890128+1", 0, "1234567890128+01", "123456789012801" }, /* 20*/ { BARCODE_EAN13, -1, "1234567890128+1", 0, "1234567890128+01", "" }, /* 21*/ { BARCODE_EANX_CHK, -1, "1234567890128+1", 0, "1234567890128+01", "" }, - /* 22*/ { BARCODE_EAN13, BARCODE_RAW_TEXT, "1234567890128+1", 0, "1234567890128+01", "123456789012801" }, - /* 23*/ { BARCODE_EANX_CHK, BARCODE_RAW_TEXT, "1234567890128+1", 0, "1234567890128+01", "123456789012801" }, + /* 22*/ { BARCODE_EAN13, BARCODE_CONTENT_SEGS, "1234567890128+1", 0, "1234567890128+01", "123456789012801" }, + /* 23*/ { BARCODE_EANX_CHK, BARCODE_CONTENT_SEGS, "1234567890128+1", 0, "1234567890128+01", "123456789012801" }, /* 24*/ { BARCODE_EAN13, -1, "12345678", 0, "0000123456784", "" }, /* 25*/ { BARCODE_EANX, -1, "12345678", 0, "0000123456784", "" }, - /* 26*/ { BARCODE_EAN13, BARCODE_RAW_TEXT, "12345678", 0, "0000123456784", "0000123456784" }, - /* 27*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "12345678", 0, "0000123456784", "0000123456784" }, + /* 26*/ { BARCODE_EAN13, BARCODE_CONTENT_SEGS, "12345678", 0, "0000123456784", "0000123456784" }, + /* 27*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "12345678", 0, "0000123456784", "0000123456784" }, /* 28*/ { BARCODE_EAN8, -1, "1234567", 0, "12345670", "" }, /* 29*/ { BARCODE_EANX, -1, "1234567", 0, "12345670", "" }, /* EAN-8 */ - /* 30*/ { BARCODE_EAN8, BARCODE_RAW_TEXT, "1234567", 0, "12345670", "12345670" }, - /* 31*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "1234567", 0, "12345670", "12345670" }, + /* 30*/ { BARCODE_EAN8, BARCODE_CONTENT_SEGS, "1234567", 0, "12345670", "12345670" }, + /* 31*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "1234567", 0, "12345670", "12345670" }, /* 32*/ { BARCODE_EAN8, -1, "12345670", 0, "12345670", "" }, /* 33*/ { BARCODE_EANX_CHK, -1, "12345670", 0, "12345670", "" }, /* EAN-8 */ - /* 34*/ { BARCODE_EAN8, BARCODE_RAW_TEXT, "12345670", 0, "12345670", "12345670" }, - /* 35*/ { BARCODE_EANX_CHK, BARCODE_RAW_TEXT, "12345670", 0, "12345670", "12345670" }, + /* 34*/ { BARCODE_EAN8, BARCODE_CONTENT_SEGS, "12345670", 0, "12345670", "12345670" }, + /* 35*/ { BARCODE_EANX_CHK, BARCODE_CONTENT_SEGS, "12345670", 0, "12345670", "12345670" }, /* 36*/ { BARCODE_EAN8, -1, "123456", 0, "01234565", "" }, /* 37*/ { BARCODE_EANX, -1, "123456", 0, "01234565", "" }, /* EAN-8 */ - /* 38*/ { BARCODE_EAN8, BARCODE_RAW_TEXT, "123456", 0, "01234565", "01234565" }, - /* 39*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "123456", 0, "01234565", "01234565" }, + /* 38*/ { BARCODE_EAN8, BARCODE_CONTENT_SEGS, "123456", 0, "01234565", "01234565" }, + /* 39*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "123456", 0, "01234565", "01234565" }, /* 40*/ { BARCODE_EAN8, -1, "00123457", 0, "00123457", "" }, /* 41*/ { BARCODE_EANX_CHK, -1, "123457", 0, "00123457", "" }, /* EAN-8 */ - /* 42*/ { BARCODE_EAN8, BARCODE_RAW_TEXT, "00123457", 0, "00123457", "00123457" }, - /* 43*/ { BARCODE_EANX_CHK, BARCODE_RAW_TEXT, "123457", 0, "00123457", "00123457" }, + /* 42*/ { BARCODE_EAN8, BARCODE_CONTENT_SEGS, "00123457", 0, "00123457", "00123457" }, + /* 43*/ { BARCODE_EANX_CHK, BARCODE_CONTENT_SEGS, "123457", 0, "00123457", "00123457" }, /* 44*/ { BARCODE_EAN_5ADDON, -1, "12345", 0, "12345", "" }, /* 45*/ { BARCODE_EANX, -1, "12345", 0, "12345", "" }, /* EAN-5 */ - /* 46*/ { BARCODE_EAN_5ADDON, BARCODE_RAW_TEXT, "12345", 0, "12345", "12345" }, - /* 47*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "12345", 0, "12345", "12345" }, + /* 46*/ { BARCODE_EAN_5ADDON, BARCODE_CONTENT_SEGS, "12345", 0, "12345", "12345" }, + /* 47*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "12345", 0, "12345", "12345" }, /* 48*/ { BARCODE_EAN_5ADDON, -1, "123", 0, "00123", "" }, /* 49*/ { BARCODE_EANX, -1, "123", 0, "00123", "" }, /* EAN-5 */ - /* 50*/ { BARCODE_EAN_5ADDON, BARCODE_RAW_TEXT, "123", 0, "00123", "00123" }, - /* 51*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "123", 0, "00123", "00123" }, + /* 50*/ { BARCODE_EAN_5ADDON, BARCODE_CONTENT_SEGS, "123", 0, "00123", "00123" }, + /* 51*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "123", 0, "00123", "00123" }, /* 52*/ { BARCODE_EAN_2ADDON, -1, "12", 0, "12", "" }, /* 53*/ { BARCODE_EANX, -1, "12", 0, "12", "" }, /* EAN-2 */ - /* 54*/ { BARCODE_EAN_2ADDON, BARCODE_RAW_TEXT, "12", 0, "12", "12" }, - /* 55*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "12", 0, "12", "12" }, + /* 54*/ { BARCODE_EAN_2ADDON, BARCODE_CONTENT_SEGS, "12", 0, "12", "12" }, + /* 55*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "12", 0, "12", "12" }, /* 56*/ { BARCODE_EAN_2ADDON, -1, "1", 0, "01", "" }, /* 57*/ { BARCODE_EANX, -1, "1", 0, "01", "" }, /* EAN-2 */ - /* 58*/ { BARCODE_EAN_2ADDON, BARCODE_RAW_TEXT, "1", 0, "01", "01" }, - /* 59*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "1", 0, "01", "01" }, + /* 58*/ { BARCODE_EAN_2ADDON, BARCODE_CONTENT_SEGS, "1", 0, "01", "01" }, + /* 59*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "1", 0, "01", "01" }, /* 60*/ { BARCODE_EAN_2ADDON, -1, "0", 0, "00", "" }, /* 61*/ { BARCODE_EANX, -1, "0", 0, "00", "" }, /* EAN-2 */ - /* 62*/ { BARCODE_EAN_2ADDON, BARCODE_RAW_TEXT, "0", 0, "00", "00" }, - /* 63*/ { BARCODE_EANX, BARCODE_RAW_TEXT, "0", 0, "00", "00" }, + /* 62*/ { BARCODE_EAN_2ADDON, BARCODE_CONTENT_SEGS, "0", 0, "00", "00" }, + /* 63*/ { BARCODE_EANX, BARCODE_CONTENT_SEGS, "0", 0, "00", "00" }, /* 64*/ { BARCODE_ISBNX, -1, "0", 0, "9780000000002", "" }, - /* 65*/ { BARCODE_ISBNX, BARCODE_RAW_TEXT, "0", 0, "9780000000002", "9780000000002" }, + /* 65*/ { BARCODE_ISBNX, BARCODE_CONTENT_SEGS, "0", 0, "9780000000002", "9780000000002" }, /* 66*/ { BARCODE_ISBNX, -1, "123456789X", 0, "9781234567897", "" }, - /* 67*/ { BARCODE_ISBNX, BARCODE_RAW_TEXT, "123456789X", 0, "9781234567897", "9781234567897" }, + /* 67*/ { BARCODE_ISBNX, BARCODE_CONTENT_SEGS, "123456789X", 0, "9781234567897", "9781234567897" }, /* 68*/ { BARCODE_ISBNX, -1, "9781234567897", 0, "9781234567897", "" }, - /* 69*/ { BARCODE_ISBNX, BARCODE_RAW_TEXT, "9781234567897", 0, "9781234567897", "9781234567897" }, + /* 69*/ { BARCODE_ISBNX, BARCODE_CONTENT_SEGS, "9781234567897", 0, "9781234567897", "9781234567897" }, /* 70*/ { BARCODE_ISBNX, -1, "9791234567896+12", 0, "9791234567896+12", "" }, - /* 71*/ { BARCODE_ISBNX, BARCODE_RAW_TEXT, "9791234567896+12", 0, "9791234567896+12", "979123456789612" }, + /* 71*/ { BARCODE_ISBNX, BARCODE_CONTENT_SEGS, "9791234567896+12", 0, "9791234567896+12", "979123456789612" }, /* 72*/ { BARCODE_UPCA, -1, "12345678901", 0, "123456789012", "" }, - /* 73*/ { BARCODE_UPCA, BARCODE_RAW_TEXT, "12345678901", 0, "123456789012", "0123456789012" }, + /* 73*/ { BARCODE_UPCA, BARCODE_CONTENT_SEGS, "12345678901", 0, "123456789012", "0123456789012" }, /* 74*/ { BARCODE_UPCA, -1, "123456789012", 0, "123456789012", "" }, - /* 75*/ { BARCODE_UPCA, BARCODE_RAW_TEXT, "123456789012", 0, "123456789012", "0123456789012" }, + /* 75*/ { BARCODE_UPCA, BARCODE_CONTENT_SEGS, "123456789012", 0, "123456789012", "0123456789012" }, /* 76*/ { BARCODE_UPCA_CHK, -1, "123456789012", 0, "123456789012", "" }, - /* 77*/ { BARCODE_UPCA_CHK, BARCODE_RAW_TEXT, "123456789012", 0, "123456789012", "0123456789012" }, + /* 77*/ { BARCODE_UPCA_CHK, BARCODE_CONTENT_SEGS, "123456789012", 0, "123456789012", "0123456789012" }, /* 78*/ { BARCODE_UPCA, -1, "12345678905+1", 0, "123456789050+01", "" }, - /* 79*/ { BARCODE_UPCA, BARCODE_RAW_TEXT, "12345678905+1", 0, "123456789050+01", "012345678905001" }, + /* 79*/ { BARCODE_UPCA, BARCODE_CONTENT_SEGS, "12345678905+1", 0, "123456789050+01", "012345678905001" }, /* 80*/ { BARCODE_UPCA_CHK, -1, "123456789050+1", 0, "123456789050+01", "" }, - /* 81*/ { BARCODE_UPCA_CHK, BARCODE_RAW_TEXT, "123456789050+1", 0, "123456789050+01", "012345678905001" }, + /* 81*/ { BARCODE_UPCA_CHK, BARCODE_CONTENT_SEGS, "123456789050+1", 0, "123456789050+01", "012345678905001" }, /* 82*/ { BARCODE_UPCA, -1, "123456789050+123", 0, "123456789050+00123", "" }, - /* 83*/ { BARCODE_UPCA, BARCODE_RAW_TEXT, "123456789050+123", 0, "123456789050+00123", "012345678905000123" }, + /* 83*/ { BARCODE_UPCA, BARCODE_CONTENT_SEGS, "123456789050+123", 0, "123456789050+00123", "012345678905000123" }, /* 84*/ { BARCODE_UPCA_CHK, -1, "123456789050+123", 0, "123456789050+00123", "" }, - /* 85*/ { BARCODE_UPCA_CHK, BARCODE_RAW_TEXT, "123456789050+123", 0, "123456789050+00123", "012345678905000123" }, + /* 85*/ { BARCODE_UPCA_CHK, BARCODE_CONTENT_SEGS, "123456789050+123", 0, "123456789050+00123", "012345678905000123" }, /* 86*/ { BARCODE_UPCE, -1, "12345", 0, "00123457", "" }, /* equivalent: 00123400005, hrt: 00123457, Check digit: 7 */ - /* 87*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "12345", 0, "00123457", "0001234000057" }, + /* 87*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "12345", 0, "00123457", "0001234000057" }, /* 88*/ { BARCODE_UPCE_CHK, -1, "12344", 0, "00012344", "" }, /* equivalent: 00012000003, hrt: 00012344, Check digit: 4 */ - /* 89*/ { BARCODE_UPCE_CHK, BARCODE_RAW_TEXT, "12344", 0, "00012344", "0000120000034" }, + /* 89*/ { BARCODE_UPCE_CHK, BARCODE_CONTENT_SEGS, "12344", 0, "00012344", "0000120000034" }, /* 90*/ { BARCODE_UPCE, -1, "123456", 0, "01234565", "" }, /* equivalent: 01234500006, hrt: 01234565, Check digit: 5 */ - /* 91*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "123456", 0, "01234565", "0012345000065" }, + /* 91*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "123456", 0, "01234565", "0012345000065" }, /* 92*/ { BARCODE_UPCE_CHK, -1, "123457", 0, "00123457", "" }, /* equivalent: 00123400005, hrt: 00123457, Check digit: 7 */ - /* 93*/ { BARCODE_UPCE_CHK, BARCODE_RAW_TEXT, "123457", 0, "00123457", "0001234000057" }, + /* 93*/ { BARCODE_UPCE_CHK, BARCODE_CONTENT_SEGS, "123457", 0, "00123457", "0001234000057" }, /* 94*/ { BARCODE_UPCE, -1, "1234567", 0, "12345670", "" }, /* equivalent: 12345600007, hrt: 12345670, Check digit: 0 */ - /* 95*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "1234567", 0, "12345670", "0123456000070" }, + /* 95*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "1234567", 0, "12345670", "0123456000070" }, /* 96*/ { BARCODE_UPCE_CHK, -1, "1234565", 0, "01234565", "" }, /* equivalent: 01234500006, hrt: 01234565, Check digit: 5 */ - /* 97*/ { BARCODE_UPCE_CHK, BARCODE_RAW_TEXT, "1234565", 0, "01234565", "0012345000065" }, + /* 97*/ { BARCODE_UPCE_CHK, BARCODE_CONTENT_SEGS, "1234565", 0, "01234565", "0012345000065" }, /* 98*/ { BARCODE_UPCE_CHK, -1, "12345670", 0, "12345670", "" }, /* equivalent: 12345600007, hrt: 12345670, Check digit: 0 */ - /* 99*/ { BARCODE_UPCE_CHK, BARCODE_RAW_TEXT, "12345670", 0, "12345670", "0123456000070" }, + /* 99*/ { BARCODE_UPCE_CHK, BARCODE_CONTENT_SEGS, "12345670", 0, "12345670", "0123456000070" }, /*100*/ { BARCODE_UPCE, -1, "2345678", ZINT_WARN_INVALID_OPTION, "03456781", "" }, /* 2 ignored, equivalent: 03456700008, hrt: 03456781, Check digit: 1 */ - /*101*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "2345678", ZINT_WARN_INVALID_OPTION, "03456781", "0034567000081" }, + /*101*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "2345678", ZINT_WARN_INVALID_OPTION, "03456781", "0034567000081" }, /*102*/ { BARCODE_UPCE_CHK, -1, "23456781", ZINT_WARN_INVALID_OPTION, "03456781", "" }, /* 2 ignored, equivalent: 03456700008, hrt: 03456781, Check digit: 1 */ /*103*/ { BARCODE_UPCE, -1, "123455", 0, "01234558", "" }, /* equivalent: 01234500005, hrt: 01234558, Check digit: 8 (BS 797 Rule 3 (a)) */ - /*104*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "123455", 0, "01234558", "0012345000058" }, + /*104*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "123455", 0, "01234558", "0012345000058" }, /*105*/ { BARCODE_UPCE_CHK, -1, "1234558", 0, "01234558", "" }, /* equivalent: 01234500005, hrt: 01234558, Check digit: 8 (BS 797 Rule 3 (a)) */ /*106*/ { BARCODE_UPCE, -1, "456784", 0, "04567840", "" }, /* equivalent: 04567000008, hrt: 04567840, Check digit: 0 (BS 797 Rule 3 (b)) */ - /*107*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "456784", 0, "04567840", "0045670000080" }, + /*107*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "456784", 0, "04567840", "0045670000080" }, /*108*/ { BARCODE_UPCE_CHK, -1, "4567840", 0, "04567840", "" }, /* equivalent: 04567000008, hrt: 04567840, Check digit: 0 (BS 797 Rule 3 (b)) */ /*109*/ { BARCODE_UPCE, -1, "345670", 0, "03456703", "" }, /* equivalent: 03400000567, hrt: 03456703, Check digit: 3 (BS 797 Rule 3 (c)) */ - /*110*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "345670", 0, "03456703", "0034000005673" }, + /*110*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "345670", 0, "03456703", "0034000005673" }, /*111*/ { BARCODE_UPCE_CHK, -1, "3456703", 0, "03456703", "" }, /* equivalent: 03400000567, hrt: 03456703, Check digit: 3 (BS 797 Rule 3 (c)) */ /*112*/ { BARCODE_UPCE, -1, "984753", 0, "09847531", "" }, /* equivalent: 09840000075, hrt: 09847531, Check digit: 1 (BS 797 Rule 3 (d)) */ - /*113*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "984753", 0, "09847531", "0098400000751" }, + /*113*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "984753", 0, "09847531", "0098400000751" }, /*114*/ { BARCODE_UPCE_CHK, -1, "9847531", 0, "09847531", "" }, /* equivalent: 09840000075, hrt: 09847531, Check digit: 1 (BS 797 Rule 3 (d)) */ /*115*/ { BARCODE_UPCE, -1, "123453", 0, "01234531", "" }, - /*116*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "123453", 0, "01234531", "0012300000451" }, + /*116*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "123453", 0, "01234531", "0012300000451" }, /*117*/ { BARCODE_UPCE, -1, "000000", 0, "00000000", "" }, - /*118*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "000000", 0, "00000000", "0000000000000" }, + /*118*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "000000", 0, "00000000", "0000000000000" }, /*119*/ { BARCODE_UPCE, -1, "0000000", 0, "00000000", "" }, /*120*/ { BARCODE_UPCE, -1, "1000000", 0, "10000007", "" }, - /*121*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "1000000", 0, "10000007", "0100000000007" }, + /*121*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "1000000", 0, "10000007", "0100000000007" }, /*122*/ { BARCODE_UPCE, -1, "2000000", ZINT_WARN_INVALID_OPTION, "00000000", "" }, /* First char 2-9 ignored, replaced with 0 */ - /*123*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "2000000", ZINT_WARN_INVALID_OPTION, "00000000", "0000000000000" }, + /*123*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "2000000", ZINT_WARN_INVALID_OPTION, "00000000", "0000000000000" }, /*124*/ { BARCODE_UPCE, -1, "3000000", ZINT_WARN_INVALID_OPTION, "00000000", "" }, - /*125*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "3000000", ZINT_WARN_INVALID_OPTION, "00000000", "0000000000000" }, + /*125*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "3000000", ZINT_WARN_INVALID_OPTION, "00000000", "0000000000000" }, /*126*/ { BARCODE_UPCE, -1, "8000000", ZINT_WARN_INVALID_OPTION, "00000000", "" }, - /*127*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "8000000", ZINT_WARN_INVALID_OPTION, "00000000", "0000000000000" }, + /*127*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "8000000", ZINT_WARN_INVALID_OPTION, "00000000", "0000000000000" }, /*128*/ { BARCODE_UPCE, -1, "9000000", ZINT_WARN_INVALID_OPTION, "00000000", "" }, - /*129*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "9000000", ZINT_WARN_INVALID_OPTION, "00000000", "0000000000000" }, + /*129*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "9000000", ZINT_WARN_INVALID_OPTION, "00000000", "0000000000000" }, /*130*/ { BARCODE_UPCE, -1, "1234567+1", 0, "12345670+01", "" }, - /*131*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "1234567+1", 0, "12345670+01", "012345600007001" }, + /*131*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "1234567+1", 0, "12345670+01", "012345600007001" }, /*132*/ { BARCODE_UPCE, -1, "12345670+1", 0, "12345670+01", "" }, - /*133*/ { BARCODE_UPCE, BARCODE_RAW_TEXT, "12345670+1", 0, "12345670+01", "012345600007001" }, + /*133*/ { BARCODE_UPCE, BARCODE_CONTENT_SEGS, "12345670+1", 0, "12345670+01", "012345600007001" }, /*134*/ { BARCODE_UPCE_CHK, -1, "12345670+1", 0, "12345670+01", "" }, - /*135*/ { BARCODE_UPCE_CHK, BARCODE_RAW_TEXT, "12345670+1", 0, "12345670+01", "012345600007001" }, + /*135*/ { BARCODE_UPCE_CHK, BARCODE_CONTENT_SEGS, "12345670+1", 0, "12345670+01", "012345600007001" }, /*136*/ { BARCODE_UPCE_CHK, -1, "1234565+1", 0, "01234565+01", "" }, - /*137*/ { BARCODE_UPCE_CHK, BARCODE_RAW_TEXT, "1234565+1", 0, "01234565+01", "001234500006501" }, + /*137*/ { BARCODE_UPCE_CHK, BARCODE_CONTENT_SEGS, "1234565+1", 0, "01234565+01", "001234500006501" }, }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -1408,7 +1408,7 @@ static void test_hrt(const testCtx *const p_ctx) { -1 /*option_1*/, -1 /*option_2*/, -1 /*option_3*/, data[i].output_options, data[i].data, -1, debug); expected_length = (int) strlen(data[i].expected); - expected_raw_length = (int) strlen(data[i].expected_raw); + expected_content_length = (int) strlen(data[i].expected_content); ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_equal(ret, data[i].ret, "i:%d ret %d != %d (%s)\n", i, ret, data[i].ret, symbol->errtxt); @@ -1417,18 +1417,18 @@ static void test_hrt(const testCtx *const p_ctx) { i, symbol->text_length, expected_length); assert_zero(strcmp((const char *) symbol->text, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->text, data[i].expected); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, data[i].expected_raw, - expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, data[i].expected_content, + expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ZBarcode_Delete(symbol); diff --git a/backend/tests/test_vector.c b/backend/tests/test_vector.c index 4d85eb9e..31049852 100644 --- a/backend/tests/test_vector.c +++ b/backend/tests/test_vector.c @@ -966,8 +966,8 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { struct item data[] = { /* 0*/ { BARCODE_EAN13, -1, -1, "123456789012", 0, 50, 1, 95, 226, 118, 12.2, 117.2, -1, -1, 3 }, /* EAN-13 */ /* 1*/ { BARCODE_EANX, -1, -1, "123456789012", 0, 50, 1, 95, 226, 118, 12.2, 117.2, -1, -1, 3 }, /* EAN-13 */ - /* 2*/ { BARCODE_EAN13, -1, BARCODE_RAW_TEXT, "123456789012", 0, 50, 1, 95, 226, 118, 12.2, 117.2, -1, -1, 3 }, /* EAN-13 */ - /* 3*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "123456789012", 0, 50, 1, 95, 226, 118, 12.2, 117.2, -1, -1, 3 }, /* EAN-13 */ + /* 2*/ { BARCODE_EAN13, -1, BARCODE_CONTENT_SEGS, "123456789012", 0, 50, 1, 95, 226, 118, 12.2, 117.2, -1, -1, 3 }, /* EAN-13 */ + /* 3*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "123456789012", 0, 50, 1, 95, 226, 118, 12.2, 117.2, -1, -1, 3 }, /* EAN-13 */ /* 4*/ { BARCODE_EAN13, 0, -1, "123456789012", 0, 50, 1, 95, 226, 110, -1, -1, -1, -1, 0 }, /* EAN-13 */ /* 5*/ { BARCODE_EANX, 0, -1, "123456789012", 0, 50, 1, 95, 226, 110, -1, -1, -1, -1, 0 }, /* EAN-13 */ /* 6*/ { BARCODE_EAN13, -1, EANUPC_GUARD_WHITESPACE, "123456789012", 0, 50, 1, 95, 226, 118, 12.2, 117.2, 227, 117.2, 4 }, /* EAN-13 */ @@ -976,42 +976,42 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { /* 9*/ { BARCODE_EANX_CHK, 0, -1, "1234567890128", 0, 50, 1, 95, 226, 110, -1, -1, -1, -1, 0 }, /* EAN-13 */ /* 10*/ { BARCODE_EANX_CHK, -1, EANUPC_GUARD_WHITESPACE, "1234567890128", 0, 50, 1, 95, 226, 118, 12.2, 117.2, 227, 117.2, 4 }, /* EAN-13 */ /* 11*/ { BARCODE_ISBNX, -1, -1, "9784567890120", 0, 50, 1, 95, 226, 118, 12.2, 117.2, -1, -1, 3 }, - /* 12*/ { BARCODE_ISBNX, -1, BARCODE_RAW_TEXT, "9784567890120", 0, 50, 1, 95, 226, 118, 12.2, 117.2, -1, -1, 3 }, + /* 12*/ { BARCODE_ISBNX, -1, BARCODE_CONTENT_SEGS, "9784567890120", 0, 50, 1, 95, 226, 118, 12.2, 117.2, -1, -1, 3 }, /* 13*/ { BARCODE_ISBNX, 0, -1, "9784567890120", 0, 50, 1, 95, 226, 110, -1, -1, -1, -1, 0 }, /* 14*/ { BARCODE_ISBNX, -1, EANUPC_GUARD_WHITESPACE, "9784567890120", 0, 50, 1, 95, 226, 118, 12.2, 117.2, 227, 117.2, 4 }, /* 15*/ { BARCODE_EAN8, -1, -1, "1234567", 0, 50, 1, 67, 162, 118, 49, 117.2, -1, -1, 2 }, /* EAN-8 */ /* 16*/ { BARCODE_EANX, -1, -1, "1234567", 0, 50, 1, 67, 162, 118, 49, 117.2, -1, -1, 2 }, /* EAN-8 */ - /* 17*/ { BARCODE_EAN8, -1, BARCODE_RAW_TEXT, "1234567", 0, 50, 1, 67, 162, 118, 49, 117.2, -1, -1, 2 }, /* EAN-8 */ - /* 18*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "1234567", 0, 50, 1, 67, 162, 118, 49, 117.2, -1, -1, 2 }, /* EAN-8 */ + /* 17*/ { BARCODE_EAN8, -1, BARCODE_CONTENT_SEGS, "1234567", 0, 50, 1, 67, 162, 118, 49, 117.2, -1, -1, 2 }, /* EAN-8 */ + /* 18*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "1234567", 0, 50, 1, 67, 162, 118, 49, 117.2, -1, -1, 2 }, /* EAN-8 */ /* 19*/ { BARCODE_EAN8, 0, -1, "1234567", 0, 50, 1, 67, 162, 110, -1, -1, -1, -1, 0 }, /* EAN-8 */ /* 20*/ { BARCODE_EANX, 0, -1, "1234567", 0, 50, 1, 67, 162, 110, -1, -1, -1, -1, 0 }, /* EAN-8 */ /* 21*/ { BARCODE_EAN8, -1, EANUPC_GUARD_WHITESPACE, "1234567", 0, 50, 1, 67, 162, 118, 49, 117.2, -1, 117.2, 4 }, /* EAN-8 */ /* 22*/ { BARCODE_EANX, -1, EANUPC_GUARD_WHITESPACE, "1234567", 0, 50, 1, 67, 162, 118, 49, 117.2, -1, 117.2, 4 }, /* EAN-8 */ /* 23*/ { BARCODE_EAN_5ADDON, -1, -1, "1234", 0, 50, 1, 47, 104, 118, 47, 15.6, -1, -1, 1 }, /* EAN-5 */ /* 24*/ { BARCODE_EANX, -1, -1, "1234", 0, 50, 1, 47, 104, 118, 47, 15.6, -1, -1, 1 }, /* EAN-5 */ - /* 25*/ { BARCODE_EAN_5ADDON, -1, BARCODE_RAW_TEXT, "1234", 0, 50, 1, 47, 104, 118, 47, 15.6, -1, -1, 1 }, /* EAN-5 */ - /* 26*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "1234", 0, 50, 1, 47, 104, 118, 47, 15.6, -1, -1, 1 }, /* EAN-5 */ + /* 25*/ { BARCODE_EAN_5ADDON, -1, BARCODE_CONTENT_SEGS, "1234", 0, 50, 1, 47, 104, 118, 47, 15.6, -1, -1, 1 }, /* EAN-5 */ + /* 26*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "1234", 0, 50, 1, 47, 104, 118, 47, 15.6, -1, -1, 1 }, /* EAN-5 */ /* 27*/ { BARCODE_EAN_5ADDON, 0, -1, "1234", 0, 50, 1, 47, 104, 100, -1, -1, -1, -1, 0 }, /* EAN-5 */ /* 28*/ { BARCODE_EANX, 0, -1, "1234", 0, 50, 1, 47, 104, 100, -1, -1, -1, -1, 0 }, /* EAN-5 */ /* 29*/ { BARCODE_EAN_5ADDON, -1, EANUPC_GUARD_WHITESPACE, "1234", 0, 50, 1, 47, 104, 118, 47, 15.6, 105, 15.6, 2 }, /* EAN-5 */ /* 30*/ { BARCODE_EANX, -1, EANUPC_GUARD_WHITESPACE, "1234", 0, 50, 1, 47, 104, 118, 47, 15.6, 105, 15.6, 2 }, /* EAN-5 */ /* 31*/ { BARCODE_EAN_2ADDON, -1, -1, "12", 0, 50, 1, 20, 50, 118, 20, 15.6, -1, -1, 1 }, /* EAN-2 */ /* 32*/ { BARCODE_EANX, -1, -1, "12", 0, 50, 1, 20, 50, 118, 20, 15.6, -1, -1, 1 }, /* EAN-2 */ - /* 33*/ { BARCODE_EAN_2ADDON, -1, BARCODE_RAW_TEXT, "12", 0, 50, 1, 20, 50, 118, 20, 15.6, -1, -1, 1 }, /* EAN-2 */ - /* 34*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "12", 0, 50, 1, 20, 50, 118, 20, 15.6, -1, -1, 1 }, /* EAN-2 */ + /* 33*/ { BARCODE_EAN_2ADDON, -1, BARCODE_CONTENT_SEGS, "12", 0, 50, 1, 20, 50, 118, 20, 15.6, -1, -1, 1 }, /* EAN-2 */ + /* 34*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "12", 0, 50, 1, 20, 50, 118, 20, 15.6, -1, -1, 1 }, /* EAN-2 */ /* 35*/ { BARCODE_EAN_2ADDON, 0, -1, "12", 0, 50, 1, 20, 50, 100, -1, -1, -1, -1, 0 }, /* EAN-2 */ /* 36*/ { BARCODE_EANX, 0, -1, "12", 0, 50, 1, 20, 50, 100, -1, -1, -1, -1, 0 }, /* EAN-2 */ /* 37*/ { BARCODE_EAN_2ADDON, -1, EANUPC_GUARD_WHITESPACE, "12", 0, 50, 1, 20, 50, 118, 20, 15.6, 51, 15.6, 2 }, /* EAN-2 */ /* 38*/ { BARCODE_EANX, -1, EANUPC_GUARD_WHITESPACE, "12", 0, 50, 1, 20, 50, 118, 20, 15.6, 51, 15.6, 2 }, /* EAN-2 */ /* 39*/ { BARCODE_UPCA, -1, -1, "12345678901", 0, 50, 1, 95, 226, 118, 8.7, 117.2, -1, -1, 4 }, - /* 40*/ { BARCODE_UPCA, -1, BARCODE_RAW_TEXT, "12345678901", 0, 50, 1, 95, 226, 118, 8.7, 117.2, -1, -1, 4 }, + /* 40*/ { BARCODE_UPCA, -1, BARCODE_CONTENT_SEGS, "12345678901", 0, 50, 1, 95, 226, 118, 8.7, 117.2, -1, -1, 4 }, /* 41*/ { BARCODE_UPCA, 0, -1, "12345678901", 0, 50, 1, 95, 226, 110, -1, -1, -1, -1, 0 }, /* 42*/ { BARCODE_UPCA, -1, EANUPC_GUARD_WHITESPACE, "12345678901", 0, 50, 1, 95, 226, 118, 8.7, 117.2, -1, -1, 4 }, /* 43*/ { BARCODE_UPCA_CHK, -1, -1, "123456789012", 0, 50, 1, 95, 226, 118, 8.7, 117.2, -1, -1, 4 }, /* 44*/ { BARCODE_UPCA_CHK, 0, -1, "123456789012", 0, 50, 1, 95, 226, 110, -1, -1, -1, -1, 0 }, /* 45*/ { BARCODE_UPCA_CHK, -1, EANUPC_GUARD_WHITESPACE, "123456789012", 0, 50, 1, 95, 226, 118, 8.7, 117.2, -1, -1, 4 }, /* 46*/ { BARCODE_UPCE, -1, -1, "1234567", 0, 50, 1, 51, 134, 118, 8.7, 117.2, -1, -1, 3 }, - /* 47*/ { BARCODE_UPCE, -1, BARCODE_RAW_TEXT, "1234567", 0, 50, 1, 51, 134, 118, 8.7, 117.2, -1, -1, 3 }, + /* 47*/ { BARCODE_UPCE, -1, BARCODE_CONTENT_SEGS, "1234567", 0, 50, 1, 51, 134, 118, 8.7, 117.2, -1, -1, 3 }, /* 48*/ { BARCODE_UPCE, 0, -1, "1234567", 0, 50, 1, 51, 134, 110, -1, -1, -1, -1, 0 }, /* 49*/ { BARCODE_UPCE, -1, EANUPC_GUARD_WHITESPACE, "1234567", 0, 50, 1, 51, 134, 118, 8.7, 117.2, -1, -1, 3 }, /* 50*/ { BARCODE_UPCE_CHK, -1, -1, "12345670", 0, 50, 1, 51, 134, 118, 8.7, 117.2, -1, -1, 3 }, @@ -1019,8 +1019,8 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { /* 52*/ { BARCODE_UPCE_CHK, -1, EANUPC_GUARD_WHITESPACE, "12345670", 0, 50, 1, 51, 134, 118, 8.7, 117.2, -1, -1, 3 }, /* 53*/ { BARCODE_EAN13, -1, -1, "123456789012+12", 0, 50, 1, 122, 276.0, 118, 12.2, 117.2, 246, 15.6, 4 }, /* EAN-13 + EAN-2 */ /* 54*/ { BARCODE_EANX, -1, -1, "123456789012+12", 0, 50, 1, 122, 276.0, 118, 12.2, 117.2, 246, 15.6, 4 }, /* EAN-13 + EAN-2 */ - /* 55*/ { BARCODE_EAN13, -1, BARCODE_RAW_TEXT, "123456789012+12", 0, 50, 1, 122, 276.0, 118, 12.2, 117.2, 246, 15.6, 4 }, /* EAN-13 + EAN-2 */ - /* 56*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "123456789012+12", 0, 50, 1, 122, 276.0, 118, 12.2, 117.2, 246, 15.6, 4 }, /* EAN-13 + EAN-2 */ + /* 55*/ { BARCODE_EAN13, -1, BARCODE_CONTENT_SEGS, "123456789012+12", 0, 50, 1, 122, 276.0, 118, 12.2, 117.2, 246, 15.6, 4 }, /* EAN-13 + EAN-2 */ + /* 56*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "123456789012+12", 0, 50, 1, 122, 276.0, 118, 12.2, 117.2, 246, 15.6, 4 }, /* EAN-13 + EAN-2 */ /* 57*/ { BARCODE_EAN13, 0, -1, "123456789012+12", 0, 50, 1, 122, 276.0, 110, -1, -1, -1, -1, 0 }, /* EAN-13 + EAN-2 */ /* 58*/ { BARCODE_EANX, 0, -1, "123456789012+12", 0, 50, 1, 122, 276.0, 110, -1, -1, -1, -1, 0 }, /* EAN-13 + EAN-2 */ /* 59*/ { BARCODE_EAN13, -1, EANUPC_GUARD_WHITESPACE, "123456789012+12", 0, 50, 1, 122, 276.0, 118, 12.2, 117.2, 246, 15.6, 5 }, /* EAN-13 + EAN-2 */ @@ -1030,8 +1030,8 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { /* 63*/ { BARCODE_ISBNX, -1, EANUPC_GUARD_WHITESPACE, "9784567890120+12", 0, 50, 1, 122, 276.0, 118, 246, 15.6, 277, 15.6, 5 }, /* ISBN + EAN-2 */ /* 64*/ { BARCODE_EAN13, -1, -1, "123456789012+12345", 0, 50, 1, 149, 330.0, 118, 12.2, 117.2, 274, 15.6, 4 }, /* EAN-13 + EAN-5 */ /* 65*/ { BARCODE_EANX, -1, -1, "123456789012+12345", 0, 50, 1, 149, 330.0, 118, 12.2, 117.2, 274, 15.6, 4 }, /* EAN-13 + EAN-5 */ - /* 66*/ { BARCODE_EAN13, -1, BARCODE_RAW_TEXT, "123456789012+12345", 0, 50, 1, 149, 330.0, 118, 12.2, 117.2, 274, 15.6, 4 }, /* EAN-13 + EAN-5 */ - /* 67*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "123456789012+12345", 0, 50, 1, 149, 330.0, 118, 12.2, 117.2, 274, 15.6, 4 }, /* EAN-13 + EAN-5 */ + /* 66*/ { BARCODE_EAN13, -1, BARCODE_CONTENT_SEGS, "123456789012+12345", 0, 50, 1, 149, 330.0, 118, 12.2, 117.2, 274, 15.6, 4 }, /* EAN-13 + EAN-5 */ + /* 67*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "123456789012+12345", 0, 50, 1, 149, 330.0, 118, 12.2, 117.2, 274, 15.6, 4 }, /* EAN-13 + EAN-5 */ /* 68*/ { BARCODE_EAN13, 0, -1, "123456789012+12345", 0, 50, 1, 149, 330.0, 110, -1, -1, -1, -1, 0 }, /* EAN-13 + EAN-5 */ /* 69*/ { BARCODE_EANX, 0, -1, "123456789012+12345", 0, 50, 1, 149, 330.0, 110, -1, -1, -1, -1, 0 }, /* EAN-13 + EAN-5 */ /* 70*/ { BARCODE_EAN13, -1, EANUPC_GUARD_WHITESPACE, "123456789012+12345", 0, 50, 1, 149, 330.0, 118, 12.2, 117.2, 274, 15.6, 5 }, /* EAN-13 + EAN-5 */ @@ -1041,34 +1041,34 @@ static void test_upcean_hrt(const testCtx *const p_ctx) { /* 74*/ { BARCODE_ISBNX, -1, EANUPC_GUARD_WHITESPACE, "9784567890120+12345", 0, 50, 1, 149, 330.0, 118, 274, 15.6, 331, 15.6, 5 }, /* ISBN + EAN-5 */ /* 75*/ { BARCODE_EAN8, -1, -1, "1234567+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 118, 49, 117.2, 182, 15.6, 3 }, /* EAN-8 + EAN-2 */ /* 76*/ { BARCODE_EANX, -1, -1, "1234567+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 118, 49, 117.2, 182, 15.6, 3 }, /* EAN-8 + EAN-2 */ - /* 77*/ { BARCODE_EAN8, -1, BARCODE_RAW_TEXT, "1234567+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 118, 49, 117.2, 182, 15.6, 3 }, /* EAN-8 + EAN-2 */ - /* 78*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "1234567+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 118, 49, 117.2, 182, 15.6, 3 }, /* EAN-8 + EAN-2 */ + /* 77*/ { BARCODE_EAN8, -1, BARCODE_CONTENT_SEGS, "1234567+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 118, 49, 117.2, 182, 15.6, 3 }, /* EAN-8 + EAN-2 */ + /* 78*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "1234567+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 118, 49, 117.2, 182, 15.6, 3 }, /* EAN-8 + EAN-2 */ /* 79*/ { BARCODE_EAN8, 0, -1, "1234567+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 110, -1, -1, -1, -1, 0 }, /* EAN-8 + EAN-2 */ /* 80*/ { BARCODE_EANX, 0, -1, "1234567+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 110, -1, -1, -1, -1, 0 }, /* EAN-8 + EAN-2 */ /* 81*/ { BARCODE_EAN8, -1, EANUPC_GUARD_WHITESPACE, "1234567+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 118, 182, 15.6, 213, 15.6, 5 }, /* EAN-8 + EAN-2 */ /* 82*/ { BARCODE_EANX, -1, EANUPC_GUARD_WHITESPACE, "1234567+12", ZINT_WARN_NONCOMPLIANT, 50, 1, 94, 212, 118, 182, 15.6, 213, 15.6, 5 }, /* EAN-8 + EAN-2 */ /* 83*/ { BARCODE_EAN8, -1, -1, "1234567+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 118, 49, 117.2, 210, 15.6, 3 }, /* EAN-8 + EAN-5 */ /* 84*/ { BARCODE_EANX, -1, -1, "1234567+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 118, 49, 117.2, 210, 15.6, 3 }, /* EAN-8 + EAN-5 */ - /* 85*/ { BARCODE_EAN8, -1, BARCODE_RAW_TEXT, "1234567+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 118, 49, 117.2, 210, 15.6, 3 }, /* EAN-8 + EAN-5 */ - /* 86*/ { BARCODE_EANX, -1, BARCODE_RAW_TEXT, "1234567+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 118, 49, 117.2, 210, 15.6, 3 }, /* EAN-8 + EAN-5 */ + /* 85*/ { BARCODE_EAN8, -1, BARCODE_CONTENT_SEGS, "1234567+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 118, 49, 117.2, 210, 15.6, 3 }, /* EAN-8 + EAN-5 */ + /* 86*/ { BARCODE_EANX, -1, BARCODE_CONTENT_SEGS, "1234567+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 118, 49, 117.2, 210, 15.6, 3 }, /* EAN-8 + EAN-5 */ /* 87*/ { BARCODE_EAN8, 0, -1, "1234567+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 110, -1, -1, -1, -1, 0 }, /* EAN-8 + EAN-5 */ /* 88*/ { BARCODE_EANX, 0, -1, "1234567+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 110, -1, -1, -1, -1, 0 }, /* EAN-8 + EAN-5 */ /* 89*/ { BARCODE_EAN8, -1, EANUPC_GUARD_WHITESPACE, "1234567+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 118, 210, 15.6, 210, 15.6, 5 }, /* EAN-8 + EAN-5 */ /* 90*/ { BARCODE_EANX, -1, EANUPC_GUARD_WHITESPACE, "1234567+12345", ZINT_WARN_NONCOMPLIANT, 50, 1, 121, 266, 118, 210, 15.6, 210, 15.6, 5 }, /* EAN-8 + EAN-5 */ /* 91*/ { BARCODE_UPCA, -1, -1, "12345678901+12", 0, 50, 1, 124, 276, 118, 8.7, 117.2, 246, 15.6, 5 }, - /* 92*/ { BARCODE_UPCA, -1, BARCODE_RAW_TEXT, "12345678901+12", 0, 50, 1, 124, 276, 118, 8.7, 117.2, 246, 15.6, 5 }, + /* 92*/ { BARCODE_UPCA, -1, BARCODE_CONTENT_SEGS, "12345678901+12", 0, 50, 1, 124, 276, 118, 8.7, 117.2, 246, 15.6, 5 }, /* 93*/ { BARCODE_UPCA, 0, -1, "12345678901+12", 0, 50, 1, 124, 276, 110, -1, -1, -1, -1, 0 }, /* 94*/ { BARCODE_UPCA, -1, EANUPC_GUARD_WHITESPACE, "12345678901+12", 0, 50, 1, 124, 276, 118, 8.7, 117.2, 277, 15.6, 6 }, /* 95*/ { BARCODE_UPCA, -1, -1, "12345678901+12345", 0, 50, 1, 151, 330, 118, 8.7, 117.2, 274, 15.6, 5 }, - /* 96*/ { BARCODE_UPCA, -1, BARCODE_RAW_TEXT, "12345678901+12345", 0, 50, 1, 151, 330, 118, 8.7, 117.2, 274, 15.6, 5 }, + /* 96*/ { BARCODE_UPCA, -1, BARCODE_CONTENT_SEGS, "12345678901+12345", 0, 50, 1, 151, 330, 118, 8.7, 117.2, 274, 15.6, 5 }, /* 97*/ { BARCODE_UPCA, 0, -1, "12345678901+12345", 0, 50, 1, 151, 330, 110, -1, -1, -1, -1, 0 }, /* 98*/ { BARCODE_UPCA, -1, EANUPC_GUARD_WHITESPACE, "12345678901+12345", 0, 50, 1, 151, 330, 118, 274, 15.6, 331, 15.6, 6 }, /* 99*/ { BARCODE_UPCE, -1, -1, "1234567+12", 0, 50, 1, 78, 184.0, 118, 8.7, 117.2, 154, 15.6, 4 }, - /*100*/ { BARCODE_UPCE, -1, BARCODE_RAW_TEXT, "1234567+12", 0, 50, 1, 78, 184.0, 118, 8.7, 117.2, 154, 15.6, 4 }, + /*100*/ { BARCODE_UPCE, -1, BARCODE_CONTENT_SEGS, "1234567+12", 0, 50, 1, 78, 184.0, 118, 8.7, 117.2, 154, 15.6, 4 }, /*101*/ { BARCODE_UPCE, 0, -1, "1234567+12", 0, 50, 1, 78, 184.0, 110, -1, -1, -1, -1, 0 }, /*102*/ { BARCODE_UPCE, -1, EANUPC_GUARD_WHITESPACE, "1234567+12", 0, 50, 1, 78, 184.0, 118, 8.7, 117.2, 185, 15.6, 5 }, /*103*/ { BARCODE_UPCE, -1, -1, "1234567+12345", 0, 50, 1, 105, 238.0, 118, 8.7, 117.2, 182, 15.6, 4 }, - /*104*/ { BARCODE_UPCE, -1, BARCODE_RAW_TEXT, "1234567+12345", 0, 50, 1, 105, 238.0, 118, 8.7, 117.2, 182, 15.6, 4 }, + /*104*/ { BARCODE_UPCE, -1, BARCODE_CONTENT_SEGS, "1234567+12345", 0, 50, 1, 105, 238.0, 118, 8.7, 117.2, 182, 15.6, 4 }, /*105*/ { BARCODE_UPCE, 0, -1, "1234567+12345", 0, 50, 1, 105, 238.0, 110, -1, -1, -1, -1, 0 }, /*106*/ { BARCODE_UPCE, -1, EANUPC_GUARD_WHITESPACE, "1234567+12345", 0, 50, 1, 105, 238.0, 118, 182, 15.6, 239, 15.6, 5 }, }; @@ -3296,7 +3296,7 @@ static void test_height_per_row(const testCtx *const p_ctx) { testFinish(); } -static void test_hrt_raw_text(const testCtx *const p_ctx) { +static void test_hrt_content_segs(const testCtx *const p_ctx) { int debug = p_ctx->debug; struct item { @@ -3312,38 +3312,38 @@ static void test_hrt_raw_text(const testCtx *const p_ctx) { float expected_vector_width; const char *expected; int expected_length; - const char *expected_raw; - int expected_raw_length; + const char *expected_content; + int expected_content_length; const char *expected_errtxt; }; static const struct item data[] = { /* 0*/ { BARCODE_CODE128, -1, -1, BARCODE_MEMORY_FILE, "12345\00067890", 11, 0, 116.279999, 268, "12345 67890", -1, "", -1, "" }, - /* 1*/ { BARCODE_CODE128, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "12345\00067890", 11, 0, 116.279999, 268, "12345 67890", -1, "12345\00067890", 11, "" }, + /* 1*/ { BARCODE_CODE128, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "12345\00067890", 11, 0, 116.279999, 268, "12345 67890", -1, "12345\00067890", 11, "" }, /* 2*/ { BARCODE_EXCODE39, -1, -1, BARCODE_MEMORY_FILE, "12345\00067890", 11, 0, 116.279999, 362, "12345 67890", -1, "", -1, "" }, - /* 3*/ { BARCODE_EXCODE39, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "12345\00067890", 11, 0, 116.279999, 362, "12345 67890", -1, "12345\00067890", 11, "" }, + /* 3*/ { BARCODE_EXCODE39, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "12345\00067890", 11, 0, 116.279999, 362, "12345 67890", -1, "12345\00067890", 11, "" }, /* 4*/ { BARCODE_TELEPEN, -1, -1, BARCODE_MEMORY_FILE, "12345\00067890", 11, 0, 116.279999, 448, "12345 67890", -1, "", -1, "" }, - /* 5*/ { BARCODE_TELEPEN, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "12345\00067890", 11, 0, 116.279999, 448, "12345 67890", -1, "12345\00067890n", 12, "" }, + /* 5*/ { BARCODE_TELEPEN, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "12345\00067890", 11, 0, 116.279999, 448, "12345 67890", -1, "12345\00067890n", 12, "" }, /* 6*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE, "123456789012", -1, 0, 118, 226, "1234567890128", -1, "", -1, "" }, /* 7*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE, "123456789012", -1, 0, 118, 226, "1234567890128", -1, "", -1, "" }, - /* 8*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "123456789012", -1, 0, 118, 226, "1234567890128", -1, "1234567890128", -1, "" }, - /* 9*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "123456789012", -1, 0, 118, 226, "1234567890128", -1, "1234567890128", -1, "" }, + /* 8*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "123456789012", -1, 0, 118, 226, "1234567890128", -1, "1234567890128", -1, "" }, + /* 9*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "123456789012", -1, 0, 118, 226, "1234567890128", -1, "1234567890128", -1, "" }, /* 10*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE, "123456789012+12", -1, 0, 118, 276, "1234567890128+12", -1, "", -1, "" }, /* 11*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE, "123456789012+12", -1, 0, 118, 276, "1234567890128+12", -1, "", -1, "" }, - /* 12*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "123456789012+12", -1, 0, 118, 276, "1234567890128+12", -1, "123456789012812", -1, "" }, - /* 13*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "123456789012+12", -1, 0, 118, 276, "1234567890128+12", -1, "123456789012812", -1, "" }, + /* 12*/ { BARCODE_EAN13, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "123456789012+12", -1, 0, 118, 276, "1234567890128+12", -1, "123456789012812", -1, "" }, + /* 13*/ { BARCODE_EANX, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "123456789012+12", -1, 0, 118, 276, "1234567890128+12", -1, "123456789012812", -1, "" }, /* 14*/ { BARCODE_CODE39, -1, -1, BARCODE_MEMORY_FILE, "ABC14", -1, 0, 116.279999, 180, "*ABC14*", -1, "", -1, "" }, - /* 15*/ { BARCODE_CODE39, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "ABC14", -1, 0, 116.279999, 180, "*ABC14*", -1, "ABC14", -1, "" }, + /* 15*/ { BARCODE_CODE39, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "ABC14", -1, 0, 116.279999, 180, "*ABC14*", -1, "ABC14", -1, "" }, /* 16*/ { BARCODE_CODE39, -1, 1, BARCODE_MEMORY_FILE, "ABC14", -1, 0, 116.279999, 206, "*ABC14_*", -1, "", -1, "" }, /* Check digit space rendered as underscore */ - /* 17*/ { BARCODE_CODE39, -1, 1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "ABC14", -1, 0, 116.279999, 206, "*ABC14_*", -1, "ABC14 ", -1, "" }, + /* 17*/ { BARCODE_CODE39, -1, 1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "ABC14", -1, 0, 116.279999, 206, "*ABC14_*", -1, "ABC14 ", -1, "" }, /* 18*/ { BARCODE_POSTNET, -1, -1, BARCODE_MEMORY_FILE, "12345", -1, 0, 24, 126, "", -1, "", -1, "" }, - /* 19*/ { BARCODE_POSTNET, -1, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "12345", -1, 0, 24, 126, "", -1, "123455", -1, "" }, /* HRT not printed */ + /* 19*/ { BARCODE_POSTNET, -1, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "12345", -1, 0, 24, 126, "", -1, "123455", -1, "" }, /* HRT not printed */ /* 20*/ { BARCODE_POSTNET, 0, -1, BARCODE_MEMORY_FILE, "12345", -1, 0, 24, 126, "", -1, "", -1, "" }, - /* 21*/ { BARCODE_POSTNET, 0, -1, BARCODE_MEMORY_FILE | BARCODE_RAW_TEXT, "12345", -1, 0, 24, 126, "", -1, "123455", -1, "" }, /* HRT not printed */ + /* 21*/ { BARCODE_POSTNET, 0, -1, BARCODE_MEMORY_FILE | BARCODE_CONTENT_SEGS, "12345", -1, 0, 24, 126, "", -1, "123455", -1, "" }, /* HRT not printed */ }; const int data_size = ARRAY_SIZE(data); int i, length, ret; struct zint_symbol *symbol = NULL; - int expected_length, expected_raw_length; + int expected_length, expected_content_length; testStartSymbol(p_ctx->func_name, &symbol); @@ -3364,8 +3364,8 @@ static void test_hrt_raw_text(const testCtx *const p_ctx) { -1 /*option_1*/, data[i].option_2, -1 /*option_3*/, data[i].output_options, data[i].data, data[i].length, debug); expected_length = data[i].expected_length == -1 ? (int) strlen(data[i].expected) : data[i].expected_length; - expected_raw_length = data[i].expected_raw_length == -1 ? (int) strlen(data[i].expected_raw) - : data[i].expected_raw_length; + expected_content_length = data[i].expected_content_length == -1 ? (int) strlen(data[i].expected_content) + : data[i].expected_content_length; ret = ZBarcode_Encode(symbol, TCU(data[i].data), length); assert_zero(ret, "i:%d ZBarcode_Encode(%s) ret %d != 0 (%s)\n", @@ -3375,18 +3375,18 @@ static void test_hrt_raw_text(const testCtx *const p_ctx) { i, symbol->text_length, expected_length, symbol->text); assert_zero(memcmp(symbol->text, data[i].expected, expected_length), "i:%d memcmp(%s, %s, %d) != 0\n", i, symbol->text, data[i].expected, expected_length); - if (symbol->output_options & BARCODE_RAW_TEXT) { - assert_nonnull(symbol->raw_segs, "i:%d raw_segs NULL\n", i); - assert_nonnull(symbol->raw_segs[0].source, "i:%d raw_segs[0].source NULL\n", i); - assert_equal(symbol->raw_segs[0].length, expected_raw_length, - "i:%d raw_segs[0].length %d != expected_raw_length %d\n", - i, symbol->raw_segs[0].length, expected_raw_length); - assert_zero(memcmp(symbol->raw_segs[0].source, data[i].expected_raw, expected_raw_length), + if (symbol->output_options & BARCODE_CONTENT_SEGS) { + assert_nonnull(symbol->content_segs, "i:%d content_segs NULL\n", i); + assert_nonnull(symbol->content_segs[0].source, "i:%d content_segs[0].source NULL\n", i); + assert_equal(symbol->content_segs[0].length, expected_content_length, + "i:%d content_segs[0].length %d != expected_content_length %d\n", + i, symbol->content_segs[0].length, expected_content_length); + assert_zero(memcmp(symbol->content_segs[0].source, data[i].expected_content, expected_content_length), "i:%d memcmp(%.*s, %.*s, %d) != 0\n", - i, symbol->raw_segs[0].length, symbol->raw_segs[0].source, expected_raw_length, - data[i].expected_raw, expected_raw_length); + i, symbol->content_segs[0].length, symbol->content_segs[0].source, expected_content_length, + data[i].expected_content, expected_content_length); } else { - assert_null(symbol->raw_segs, "i:%d raw_segs not NULL\n", i); + assert_null(symbol->content_segs, "i:%d content_segs not NULL\n", i); } ret = ZBarcode_Print(symbol, 0); @@ -3428,7 +3428,7 @@ int main(int argc, char *argv[]) { { "test_text_gap", test_text_gap }, { "test_height", test_height }, { "test_height_per_row", test_height_per_row }, - { "test_hrt_raw_text", test_hrt_raw_text }, + { "test_hrt_content_segs", test_hrt_content_segs }, }; testRun(argc, argv, funcs, ARRAY_SIZE(funcs)); diff --git a/backend/tests/testcommon.c b/backend/tests/testcommon.c index ae44b4df..82c802a4 100644 --- a/backend/tests/testcommon.c +++ b/backend/tests/testcommon.c @@ -697,7 +697,7 @@ const char *testUtilOutputOptionsName(int output_options) { { "EANUPC_GUARD_WHITESPACE", EANUPC_GUARD_WHITESPACE, 0x4000 }, { "EMBED_VECTOR_FONT", EMBED_VECTOR_FONT, 0x8000 }, { "BARCODE_MEMORY_FILE", BARCODE_MEMORY_FILE, 0x10000 }, - { "BARCODE_RAW_TEXT", BARCODE_RAW_TEXT, 0x20000 }, + { "BARCODE_CONTENT_SEGS", BARCODE_CONTENT_SEGS, 0x20000 }, }; static int const data_size = ARRAY_SIZE(data); int set = 0; diff --git a/backend/ultra.c b/backend/ultra.c index 3a460fcf..f7257de5 100644 --- a/backend/ultra.c +++ b/backend/ultra.c @@ -808,7 +808,7 @@ static int ult_generate_codewords_segs(struct zint_symbol *symbol, struct zint_s const int gs1 = (symbol->input_mode & 0x07) == GS1_MODE; /* 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 (segs[i].eci) { @@ -910,15 +910,15 @@ static int ult_generate_codewords_segs(struct zint_symbol *symbol, struct zint_s current_mode = symbol_mode; codeword_count = ult_generate_codewords(symbol, source, length, 0 /*eci*/, gs1, symbol_mode, ¤t_mode, codewords, codeword_count); - if (raw_text && segs[0].eci) { - z_rt_set_seg_eci(symbol, 0, segs[0].eci); + if (content_segs && segs[0].eci) { + z_ct_set_seg_eci(symbol, 0, segs[0].eci); } 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, ¤t_mode, codewords, codeword_count); - 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); } } diff --git a/backend/upcean.c b/backend/upcean.c index 98130b65..292fb6b6 100644 --- a/backend/upcean.c +++ b/backend/upcean.c @@ -875,7 +875,7 @@ INTERNAL int zint_eanx_cc(struct zint_symbol *symbol, unsigned char source[], in int error_number = 0, i, sep_count; int addon_gap = 0; int first_part_len, second_part_len; - const int raw_text = symbol->output_options & BARCODE_RAW_TEXT; + const int content_segs = symbol->output_options & BARCODE_CONTENT_SEGS; if (length > 19) { return z_errtxtf(ZINT_ERROR_TOO_LONG, symbol, 283, "Input length %d too long (maximum 19)", length); @@ -1083,12 +1083,12 @@ INTERNAL int zint_eanx_cc(struct zint_symbol *symbol, unsigned char source[], in } } - if (raw_text) { + if (content_segs) { const int is_ean = z_is_ean(symbol->symbology); /* EAN-8 with no add-on, EAN-2, EAN-5 */ if (is_ean && symbol->text_length <= 8 && !second_part_len) { - if (z_rt_cpy(symbol, symbol->text, symbol->text_length)) { /* Just use the HRT */ - return ZINT_ERROR_MEMORY; /* `z_rt_cpy()` only fails with OOM */ + if (z_ct_cpy(symbol, symbol->text, symbol->text_length)) { /* Just use the HRT */ + return ZINT_ERROR_MEMORY; /* `z_ct_cpy()` only fails with OOM */ } } else { /* Expand to GTIN-13 (UPC-A, UPC-E, EAN-8 with add-on) */ unsigned char gtin13[13]; @@ -1106,8 +1106,8 @@ INTERNAL int zint_eanx_cc(struct zint_symbol *symbol, unsigned char source[], in memset(gtin13, '0', zeroes); memcpy(gtin13 + zeroes, symbol->text, 13 - zeroes); } - if (z_rt_cpy_cat(symbol, gtin13, 13, '\xFF' /*none*/, second_part, second_part_len)) { - return ZINT_ERROR_MEMORY; /* `z_rt_cpy_cat()` only fails with OOM */ + if (z_ct_cpy_cat(symbol, gtin13, 13, '\xFF' /*none*/, second_part, second_part_len)) { + return ZINT_ERROR_MEMORY; /* `z_ct_cpy_cat()` only fails with OOM */ } } } diff --git a/backend/zint.h b/backend/zint.h index fb072e38..d01b20e9 100644 --- a/backend/zint.h +++ b/backend/zint.h @@ -97,9 +97,9 @@ extern "C" { char id[32]; /* Optional ID to distinguish sequence, ASCII, NUL-terminated unless max 32 long */ }; - /* Segment for use with `raw_segs` and API `ZBarcode_Encode_Segs()` */ + /* Segment for use with API `ZBarcode_Encode_Segs()` and `content_segs` */ struct zint_seg { - unsigned char *source; /* Data to encode, or (`raw_segs`) data encoded */ + unsigned char *source; /* Data to encode */ int length; /* Length of `source`. If 0 or negative, `source` must be NUL-terminated */ int eci; /* Extended Channel Interpretation */ }; @@ -136,8 +136,6 @@ extern "C" { int text_length; /* Length of text in bytes (output only) */ int rows; /* Number of rows used by the symbol (output only) */ int width; /* Width of the generated symbol (output only) */ - unsigned char encoded_data[200][144]; /* Encoded data (output only). Allows for rows of 1152 modules */ - float row_height[200]; /* Heights of rows (output only). Allows for 200 row DotCode */ char errtxt[160]; /* Error message if an error or warning occurs, NUL-terminated (output only) */ unsigned char *bitmap; /* Stored bitmap image (raster output only) */ int bitmap_width; /* Width of bitmap image (raster output only) */ @@ -146,8 +144,10 @@ extern "C" { struct zint_vector *vector; /* Pointer to vector header (vector output only) */ unsigned char *memfile; /* Pointer to in-memory file buffer if BARCODE_MEMORY_FILE (output only) */ int memfile_size; /* Length of in-memory file buffer (output only) */ - struct zint_seg *raw_segs; /* Pointer to array of raw segs if BARCODE_RAW_TEXT (output only) */ - int raw_seg_count; /* Number of `raw_segs` (output only) */ + struct zint_seg *content_segs; /* Pointer to array of content segs if BARCODE_CONTENT_SEGS (output only) */ + int content_seg_count; /* Number of `content_segs` (output only) */ + unsigned char encoded_data[200][144]; /* Encoded data (output only). Allows for rows of 1152 modules */ + float row_height[200]; /* Heights of rows (output only). Allows for 200 row DotCode */ }; /* Symbologies (`symbol->symbology`) */ @@ -310,7 +310,7 @@ extern "C" { #define EANUPC_GUARD_WHITESPACE 0x04000 /* Add quiet zone indicators ("<"/">") to HRT whitespace (EAN/UPC) */ #define EMBED_VECTOR_FONT 0x08000 /* Embed font in vector output - currently only for SVG output */ #define BARCODE_MEMORY_FILE 0x10000 /* Write output to in-memory buffer `memfile` instead of to `outfile` */ -#define BARCODE_RAW_TEXT 0x20000 /* Write data encoded to raw segment buffers `raw_segs` */ +#define BARCODE_CONTENT_SEGS 0x20000 /* Write data encoded to content segment buffers `content_segs` */ /* Input data types (`symbol->input_mode`) */ #define DATA_MODE 0 /* Binary */ @@ -401,10 +401,10 @@ extern "C" { # define ZINT_EXTERN extern #endif - /* Create and initialize a symbol structure */ + /* Create a symbol structure and set fields to default values */ ZINT_EXTERN struct zint_symbol *ZBarcode_Create(void); - /* Free any output buffers that may have been created and initialize output fields */ + /* Free any output buffers that may have been created and zeroize output fields */ ZINT_EXTERN void ZBarcode_Clear(struct zint_symbol *symbol); /* Free any output buffers that may have been created and reset all fields to defaults */ diff --git a/docs/README b/docs/README index 142f4ff3..0072a576 100644 --- a/docs/README +++ b/docs/README @@ -1,11 +1,11 @@ -% docs/README 2025-10-08 +% docs/README 2025-11-04 -For generation of "docs/manual.pdf" and "docs/manual.txt" from "manual.pmd" using pandoc 3.8.2. +For generation of "docs/manual.pdf" and "docs/manual.txt" from "manual.pmd" using pandoc >= 3.8.2. On Ubuntu/Debian (tested on Ubuntu 22.04 and Ubuntu 24.04) - wget https://github.com/jgm/pandoc/releases/download/3.8.2/pandoc-3.8.2-1-amd64.deb - sudo dpkg -i pandoc-3.8.2-1-amd64.deb + wget https://github.com/jgm/pandoc/releases/download/3.8.2.1/pandoc-3.8.2.1-1-amd64.deb + sudo dpkg -i pandoc-3.8.2.1-1-amd64.deb sudo apt install librsvg2-bin sudo apt install texlive-xetex sudo apt install texlive-lang-cjk @@ -14,9 +14,9 @@ On Ubuntu/Debian (tested on Ubuntu 22.04 and Ubuntu 24.04) On Fedora (tested on Fedora Linux 38 (Workstation Edition) and Fedora Linux 42 (Workstation Edition)) - wget https://github.com/jgm/pandoc/releases/download/3.8.2/pandoc-3.8.2-linux-amd64.tar.gz - tar xf pandoc-3.8.2-linux-amd64.tar.gz - sudo mv -i pandoc-3.8.2/bin/pandoc /usr/local/bin + wget https://github.com/jgm/pandoc/releases/download/3.8.2.1/pandoc-3.8.2.1-linux-amd64.tar.gz + tar xf pandoc-3.8.2.1-linux-amd64.tar.gz + sudo mv -i pandoc-3.8.2.1/bin/pandoc /usr/local/bin sudo dnf install librsvg2-tools.x86_64 sudo dnf install texlive-xetex sudo dnf install texlive-ctex.noarch diff --git a/docs/manual.html b/docs/manual.html index ffcc0b86..adef1f46 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -334,7 +334,7 @@

Zint Barcode Generator and Zint Barcode Studio User Manual

Version 2.15.0.9

-

October 2025

+

November 2025