diff --git a/backend/composite.c b/backend/composite.c index a7ecabc6..8eb7d8b1 100644 --- a/backend/composite.c +++ b/backend/composite.c @@ -350,7 +350,7 @@ static int cc_b(struct zint_symbol *symbol, char source[], int cc_width) { chainemc[mclength] = 920; mclength++; - byteprocess(chainemc, &mclength, data_string, 0, length); + byteprocess(chainemc, &mclength, data_string, 0, length, symbol->debug & ZINT_DEBUG_PRINT); /* Now figure out which variant of the symbol to use and load values accordingly */ @@ -604,7 +604,7 @@ static int cc_c(struct zint_symbol *symbol, char source[], int cc_width, int ecc chainemc[mclength] = 920; /* CC-C identifier */ mclength++; - byteprocess(chainemc, &mclength, data_string, 0, length); + byteprocess(chainemc, &mclength, data_string, 0, length, symbol->debug & ZINT_DEBUG_PRINT); chainemc[0] = mclength; diff --git a/backend/pdf417.c b/backend/pdf417.c index eb39741b..58a4bed2 100644 --- a/backend/pdf417.c +++ b/backend/pdf417.c @@ -43,7 +43,6 @@ number of codeword columns not including row start and end data) */ #include -#include #include #ifndef _MSC_VER #include @@ -84,8 +83,6 @@ static const char MicroAutosize[56] = { #define PDF417_MAX_LEN 2710 /* ISO/IEC 15438:2015 5.1.1 c) 3) Max possible number of characters at error correction level 0 (Numeric Compaction mode) */ #define MICRO_PDF417_MAX_LEN 366 /* ISO/IEC 24728:2006 5.1.1 c) 3) Max possible number of characters (Numeric Compaction mode) */ -static int liste[2][PDF417_MAX_LEN]; /* global */ - /* 866 */ static int quelmode(char codeascii) { @@ -102,7 +99,7 @@ static int quelmode(char codeascii) { } /* 844 */ -static void regroupe(int *indexliste) { +static void regroupe(int liste[2][PDF417_MAX_LEN], int *indexliste) { /* bring together same type blocks */ if (*(indexliste) > 1) { @@ -130,7 +127,7 @@ static void regroupe(int *indexliste) { } /* 478 */ -static void pdfsmooth(int *indexliste) { +static void pdfsmooth(int liste[2][PDF417_MAX_LEN], int *indexliste) { int i, crnt, last, next, length; for (i = 0; i < *(indexliste); i++) { @@ -186,7 +183,7 @@ static void pdfsmooth(int *indexliste) { } } } - regroupe(indexliste); + regroupe(liste, indexliste); /* 520 */ for (i = 0; i < *(indexliste); i++) { crnt = liste[1][i]; @@ -222,18 +219,15 @@ static void pdfsmooth(int *indexliste) { } } /* 540 */ - regroupe(indexliste); + regroupe(liste, indexliste); } /* 547 */ -static void textprocess(int *chainemc, int *mclength, char chaine[], int start, int length) { - int j, indexlistet, curtable, listet[2][PDF417_MAX_LEN], chainet[PDF417_MAX_LEN], wnet; +static void textprocess(int *chainemc, int *mclength, char chaine[], int start, int length, int is_micro) { + int j, indexlistet, curtable, listet[2][PDF417_MAX_LEN] = {{0}}, chainet[PDF417_MAX_LEN], wnet; wnet = 0; - for (j = 0; j < PDF417_MAX_LEN; j++) { - listet[0][j] = 0; - } /* listet will contain the table numbers and the value of each characters */ for (indexlistet = 0; indexlistet < length; indexlistet++) { char codeascii = chaine[start + indexlistet]; @@ -403,22 +397,23 @@ static void textprocess(int *chainemc, int *mclength, char chaine[], int start, wnet++; } /* Now translate the string chainet into codewords */ - chainemc[*(mclength)] = 900; - *(mclength) = *(mclength) + 1; + + /* Default mode for PDF417 is Text Compaction Alpha (ISO/IEC 1543:2015 5.4.2.1), and for MICROPDF417 is Byte Compaction + * (ISO/IEC 24728:2006 5.4.3), so only add flag if not first codeword or is MICROPDF417 */ + if (*mclength || is_micro) { + chainemc[(*mclength)++] = 900; + } for (j = 0; j < wnet; j += 2) { int cw_number; cw_number = (30 * chainet[j]) + chainet[j + 1]; - chainemc[*(mclength)] = cw_number; - *(mclength) = *(mclength) + 1; - + chainemc[(*mclength)++] = cw_number; } } /* 671 */ -INTERNAL void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], int start, int length) { - int debug = 0; +INTERNAL void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], int start, int length, int debug) { if (debug) printf("\nEntering byte mode at position %d\n", start); @@ -435,6 +430,8 @@ INTERNAL void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], chainemc[(*mclength)++] = 924; if (debug) printf("924 "); } else { + /* Default mode for MICROPDF417 is Byte Compaction (ISO/IEC 24728:2006 5.4.3), but not emitting it depends on whether + * an ECI has been emitted previously (or not) it appears, so simpler and safer to always emit it. */ chainemc[(*mclength)++] = 901; if (debug) printf("901 "); } @@ -444,37 +441,24 @@ INTERNAL void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], while (len < length) { uint64_t total; unsigned int chunkLen = length - len; - if (6 <= chunkLen) /* Take groups of 6 */ { + if (6 <= chunkLen) { /* Take groups of 6 */ chunkLen = 6; len += chunkLen; -#if defined(_MSC_VER) && _MSC_VER == 1200 total = 0; -#else - total = 0ULL; -#endif while (chunkLen--) { uint64_t mantisa = chaine[start++]; -#if defined(_MSC_VER) && _MSC_VER == 1200 - total |= mantisa << (uint64_t) (chunkLen * 8); -#else - total |= mantisa << (uint64_t) (chunkLen * 8ULL); -#endif + total |= mantisa << (chunkLen * 8); } chunkLen = 5; while (chunkLen--) { -#if defined(_MSC_VER) && _MSC_VER == 1200 chainemc[*mclength + chunkLen] = (int) (total % 900); total /= 900; -#else - chainemc[*mclength + chunkLen] = (int) (total % 900ULL); - total /= 900ULL; -#endif } *mclength += 5; - } else /* If it remain a group of less than 6 bytes */ { + } else { /* If there remains a group of less than 6 bytes */ len += chunkLen; while (chunkLen--) { chainemc[(*mclength)++] = chaine[start++]; @@ -486,16 +470,12 @@ INTERNAL void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], /* 712 */ static void numbprocess(int *chainemc, int *mclength, char chaine[], int start, int length) { - int j, loop, dummy[100], diviseur, nombre; + int j, loop, dummy[50] = {0}, diviseur, nombre; char chainemod[50], chainemult[100], temp; strcpy(chainemod, ""); - for (loop = 0; loop <= 50; loop++) { - dummy[loop] = 0; - } - chainemc[*(mclength)] = 902; - *(mclength) = *(mclength) + 1; + chainemc[(*mclength)++] = 902; j = 0; while (j < length) { @@ -545,8 +525,7 @@ static void numbprocess(int *chainemc, int *mclength, char chaine[], int start, strcpy(chainemod, chainemult); } while (strlen(chainemult) != 0); for (loop = 0; loop < dumlength; loop++) { - chainemc[*(mclength)] = dummy[loop]; - *(mclength) = *(mclength) + 1; + chainemc[(*mclength)++] = dummy[loop]; } j += longueur; } @@ -556,11 +535,13 @@ static void numbprocess(int *chainemc, int *mclength, char chaine[], int start, static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size_t length) { int i, k, j, indexchaine, indexliste, mode, longueur, loop, mccorrection[520], offset; int total, chainemc[PDF417_MAX_LEN], mclength, c1, c2, c3, dummy[35], calcheight; + int liste[2][PDF417_MAX_LEN] = {{0}}; char pattern[580]; - int debug = symbol->debug; + int debug = symbol->debug & ZINT_DEBUG_PRINT; if (length > PDF417_MAX_LEN) { - return 2; + strcpy(symbol->errtxt, "463: Input string too long"); + return ZINT_ERROR_TOO_LONG; } /* 456 */ @@ -569,10 +550,6 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size mode = quelmode(chaine[indexchaine]); - for (i = 0; i < PDF417_MAX_LEN; i++) { - liste[0][i] = 0; - } - /* 463 */ do { liste[1][indexliste] = mode; @@ -585,7 +562,7 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size } while (indexchaine < (int)length); /* 474 */ - pdfsmooth(&indexliste); + pdfsmooth(liste, &indexliste); if (debug) { printf("Initial block pattern:\n"); @@ -645,10 +622,10 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size for (i = 0; i < indexliste; i++) { switch (liste[1][i]) { case TEX: /* 547 - text mode */ - textprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i]); + textprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i], 0 /*is_micro*/); break; case BYT: /* 670 - octet stream mode */ - byteprocess(chainemc, &mclength, chaine, indexchaine, liste[0][i]); + byteprocess(chainemc, &mclength, chaine, indexchaine, liste[0][i], debug); break; case NUM: /* 712 - numeric mode */ numbprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i]); @@ -699,11 +676,13 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size if (longueur + k > 928) { /* Enforce maximum codeword limit */ - return 2; + strcpy(symbol->errtxt, "464: Input string too long"); + return ZINT_ERROR_TOO_LONG; } if (((longueur + k) / symbol->option_2) > 90) { - return 4; + strcpy(symbol->errtxt, "465: Data too long for specified number of columns"); + return ZINT_ERROR_TOO_LONG; } /* 781 - Padding calculation */ @@ -755,7 +734,6 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size for (loop = 0; loop < 520; loop++) { mccorrection[loop] = 0; } - total = 0; for (i = 0; i < longueur; i++) { total = (chainemc[i] + mccorrection[k - 1]) % 929; for (j = k - 1; j > 0; j--) { @@ -776,6 +754,11 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size } printf("\n"); } +#ifdef ZINT_TEST + if (symbol->debug & ZINT_DEBUG_TEST) { + debug_test_codeword_dump_int(symbol, chainemc, mclength); + } +#endif /* 818 - The CW string is finished */ c1 = (mclength / symbol->option_2 - 1) / 3; @@ -817,6 +800,8 @@ static int pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size bin_append(pdf_bitpattern[offset + dummy[j]], 16, pattern); strcat(pattern, "0"); bin_append(0x3FA29, 18, pattern); /* Row Stop */ + } else { + strcat(pattern, "1"); /* Compact PDF417 Stop pattern */ } for (loop = 0; loop < (int)strlen(pattern); loop++) { @@ -865,31 +850,7 @@ INTERNAL int pdf417enc(struct zint_symbol *symbol, unsigned char source[], const /* 352 */ if (codeerr != 0) { - switch (codeerr) { - case 1: - strcpy(symbol->errtxt, "462: No such file or file unreadable"); - error_number = ZINT_ERROR_INVALID_OPTION; - break; - case 2: - strcpy(symbol->errtxt, "463: Input string too long"); - error_number = ZINT_ERROR_TOO_LONG; - break; - case 3: - strcpy(symbol->errtxt, "464: Number of codewords per row too small"); - error_number = ZINT_WARN_INVALID_OPTION; - break; - case 4: - strcpy(symbol->errtxt, "465: Data too long for specified number of columns"); - error_number = ZINT_ERROR_TOO_LONG; - break; - case ZINT_ERROR_INVALID_OPTION: - error_number = codeerr; - break; - default: - strcpy(symbol->errtxt, "466: Something strange happened"); - error_number = ZINT_ERROR_ENCODING_PROBLEM; - break; - } + error_number = codeerr; } /* 364 */ @@ -900,10 +861,11 @@ INTERNAL int pdf417enc(struct zint_symbol *symbol, unsigned char source[], const INTERNAL int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], const size_t length) { int i, k, j, indexchaine, indexliste, mode, longueur, mccorrection[50], offset; int total, chainemc[PDF417_MAX_LEN], mclength, dummy[5], codeerr; + int liste[2][PDF417_MAX_LEN] = {{0}}; char pattern[580]; int variant, LeftRAPStart, CentreRAPStart, RightRAPStart, StartCluster; int LeftRAP, CentreRAP, RightRAP, Cluster, loop, calcheight; - int debug = 0; + int debug = symbol->debug & ZINT_DEBUG_PRINT; if (length > MICRO_PDF417_MAX_LEN) { strcpy(symbol->errtxt, "474: Input data too long"); @@ -919,10 +881,6 @@ INTERNAL int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], co mode = quelmode(chaine[indexchaine]); - for (i = 0; i < PDF417_MAX_LEN; i++) { - liste[0][i] = 0; - } - /* 463 */ do { liste[1][indexliste] = mode; @@ -935,7 +893,7 @@ INTERNAL int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], co } while (indexchaine < (int)length); /* 474 */ - pdfsmooth(&indexliste); + pdfsmooth(liste, &indexliste); if (debug) { printf("Initial mapping:\n"); @@ -995,10 +953,10 @@ INTERNAL int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], co for (i = 0; i < indexliste; i++) { switch (liste[1][i]) { case TEX: /* 547 - text mode */ - textprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i]); + textprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i], 1 /*is_micro*/); break; case BYT: /* 670 - octet stream mode */ - byteprocess(chainemc, &mclength, chaine, indexchaine, liste[0][i]); + byteprocess(chainemc, &mclength, chaine, indexchaine, liste[0][i], debug); break; case NUM: /* 712 - numeric mode */ numbprocess(chainemc, &mclength, (char*) chaine, indexchaine, liste[0][i]); @@ -1022,7 +980,7 @@ INTERNAL int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], co if (debug) { printf("\nEncoded Data Stream:\n"); for (i = 0; i < mclength; i++) { - printf("0x%02X ", chainemc[i]); + printf("%3d ", chainemc[i]); } printf("\n"); } @@ -1200,7 +1158,6 @@ INTERNAL int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], co for (loop = 0; loop < 50; loop++) { mccorrection[loop] = 0; } - total = 0; for (i = 0; i < longueur; i++) { total = (chainemc[i] + mccorrection[k - 1]) % 929; for (j = k - 1; j >= 0; j--) { @@ -1226,10 +1183,15 @@ INTERNAL int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], co if (debug) { printf("Encoded Data Stream with ECC:\n"); for (i = 0; i < mclength; i++) { - printf("0x%02X ", chainemc[i]); + printf("%3d ", chainemc[i]); } printf("\n"); } +#ifdef ZINT_TEST + if (symbol->debug & ZINT_DEBUG_TEST) { + debug_test_codeword_dump_int(symbol, chainemc, mclength); + } +#endif /* Now get the RAP (Row Address Pattern) start values */ LeftRAPStart = RAPTable[variant]; diff --git a/backend/pdf417.h b/backend/pdf417.h index 90e8b4ac..d126c2e3 100644 --- a/backend/pdf417.h +++ b/backend/pdf417.h @@ -511,4 +511,4 @@ static const unsigned short int rap_centre[52] = { 0x2DC, 0x2DE }; -void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], int start, int length); \ No newline at end of file +void byteprocess(int *chainemc, int *mclength, unsigned char chaine[], int start, int length, int debug); diff --git a/backend/tests/test_pdf417.c b/backend/tests/test_pdf417.c index bf29c297..206063be 100644 --- a/backend/tests/test_pdf417.c +++ b/backend/tests/test_pdf417.c @@ -1,6 +1,6 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2020 Robin Stuart + Copyright (C) 2019 - 2020 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -59,8 +59,13 @@ static void test_options(int index, int debug) { /* 3*/ { BARCODE_PDF417, 3, -1, -1, "12345", 0, 0, 3, 3, 7, 120, -1 }, // ECC 3, cols auto-set to 3 /* 4*/ { BARCODE_PDF417, 3, 2, -1, "12345", 0, 0, 3, 2, 10, 103, -1 }, // ECC 3, cols 2 /* 5*/ { BARCODE_PDF417, 8, 2, -1, "12345", ZINT_ERROR_TOO_LONG, -1, 8, 3, 0, 0, -1 }, // ECC 8, cols 2, fails - /* 6*/ { BARCODE_PDF417, 7, 2, -1, "12345", 0, 0, 7, 3, 87, 120, -1 }, // ECC 7, cols 2 auto-upped to 3 + /* 6*/ { BARCODE_PDF417, 7, 2, -1, "12345", 0, 0, 7, 3, 87, 120, -1 }, // ECC 7, cols 2 auto-upped to 3 (no warning, unlike MICROPDF417) /* 7*/ { BARCODE_PDF417, -1, 10, -1, "12345", 0, 0, 2, 10, 3, 239, -1 }, // ECC auto-set to 2, cols 10 + /* 8*/ { BARCODE_PDF417, 9, -1, -1, "12345", ZINT_WARN_INVALID_OPTION, 0, 2, 2, 6, 103, -1 }, // Invalid ECC, auto-set + /* 9*/ { BARCODE_PDF417, -1, 31, -1, "12345", ZINT_WARN_INVALID_OPTION, 0, 2, 2, 6, 103, 0 }, // Invalid cols, auto-set + /* 10*/ { BARCODE_PDF417, -1, 1, -1, "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHI", ZINT_ERROR_TOO_LONG, -1, 4, 2, 0, 0, -1 }, // Cols 1 too small + /* 11*/ { BARCODE_MICROPDF417, -1, 5, -1, "12345", ZINT_WARN_INVALID_OPTION, 0, -1, 1, 11, 38, -1 }, // Invalid cols, auto-set to 1 + /* 12*/ { BARCODE_MICROPDF417, -1, 1, -1, "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLM", ZINT_WARN_INVALID_OPTION, 0, -1, 2, 17, 55, -1 }, // Cols 1 too small, auto-upped to 2 with warning }; int data_size = sizeof(data) / sizeof(struct item); @@ -73,33 +78,21 @@ static void test_options(int index, int debug) { struct zint_symbol *symbol = ZBarcode_Create(); assert_nonnull(symbol, "Symbol not created\n"); - symbol->symbology = data[i].symbology; - if (data[i].option_1 != -1) { - symbol->option_1 = data[i].option_1; - } - if (data[i].option_2 != -1) { - symbol->option_2 = data[i].option_2; - } - if (data[i].option_3 != -1) { - symbol->option_3 = data[i].option_3; - } - symbol->debug |= debug; - - int length = strlen(data[i].data); + int length = testUtilSetSymbol(symbol, data[i].symbology, -1 /*input_mode*/, -1, data[i].option_1, data[i].option_2, data[i].option_3, -1 /*output_options*/, data[i].data, -1, debug); ret = ZBarcode_Encode(symbol, data[i].data, length); assert_equal(ret, data[i].ret_encode, "i:%d ZBarcode_Encode ret %d != %d (%s)\n", i, ret, data[i].ret_encode, symbol->errtxt); - assert_equal(symbol->option_1, data[i].expected_option_1, "i:%d symbol->option_1 %d != %d (%d)\n", i, symbol->option_1, data[i].expected_option_1, data[i].option_1); - assert_equal(symbol->option_2, data[i].expected_option_2, "i:%d symbol->option_2 %d != %d (%d)\n", i, symbol->option_2, data[i].expected_option_2, data[i].option_2); + assert_equal(symbol->option_1, data[i].expected_option_1, "i:%d symbol->option_1 %d != %d (%d) (%s)\n", i, symbol->option_1, data[i].expected_option_1, data[i].option_1, symbol->errtxt); + assert_equal(symbol->option_2, data[i].expected_option_2, "i:%d symbol->option_2 %d != %d (%d) (%s)\n", i, symbol->option_2, data[i].expected_option_2, data[i].option_2, symbol->errtxt); if (data[i].option_3 != -1) { assert_equal(symbol->option_3, data[i].option_3, "i:%d symbol->option_3 %d != %d\n", i, symbol->option_3, data[i].option_3); // Unchanged } else { assert_zero(symbol->option_3, "i:%d symbol->option_3 %d != 0\n", i, symbol->option_3); } - assert_equal(symbol->rows, data[i].expected_rows, "i:%d symbol->rows %d != %d\n", i, symbol->rows, data[i].expected_rows); - 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->rows, data[i].expected_rows, "i:%d symbol->rows %d != %d (%s)\n", i, symbol->rows, data[i].expected_rows, symbol->errtxt); + assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d (%s)\n", i, symbol->width, data[i].expected_width, symbol->errtxt); if (index == -1 && data[i].compare_previous != -1) { ret = testUtilSymbolCmp(symbol, &previous_symbol); @@ -118,10 +111,153 @@ static void test_options(int index, int debug) { testFinish(); } +static void test_reader_init(int index, int generate, int debug) { + + testStart(""); + + int ret; + struct item { + int symbology; + int input_mode; + int output_options; + unsigned char *data; + int ret; + int expected_rows; + int expected_width; + char *expected; + char *comment; + }; + struct item data[] = { + /* 0*/ { BARCODE_PDF417, UNICODE_MODE, READER_INIT, "A", 0, 6, 103, "(12) 4 921 900 29 60 257 719 198 75 123 199 98", "Outputs Test Alpha flag 900" }, + /* 1*/ { BARCODE_MICROPDF417, UNICODE_MODE, READER_INIT, "A", 0, 11, 38, "(11) 921 900 29 900 179 499 922 262 777 478 300", "Outputs Test Alpha flag 900" }, + }; + int data_size = ARRAY_SIZE(data); + + char escaped[1024]; + + for (int i = 0; i < data_size; i++) { + + if (index != -1 && i != index) continue; + + struct zint_symbol *symbol = ZBarcode_Create(); + assert_nonnull(symbol, "Symbol not created\n"); + + symbol->debug = ZINT_DEBUG_TEST; // Needed to get codeword dump in errtxt + + int length = testUtilSetSymbol(symbol, data[i].symbology, data[i].input_mode, -1 /*eci*/, -1 /*option_1*/, -1 /*option_2*/, -1, data[i].output_options, data[i].data, -1, debug); + + ret = ZBarcode_Encode(symbol, 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); + + if (generate) { + printf(" /*%3d*/ { %s, %s, %s, \"%s\", %s, %d, %d, \"%s\", \"%s\" },\n", + i, testUtilBarcodeName(data[i].symbology), testUtilInputModeName(data[i].input_mode), testUtilOutputOptionsName(data[i].output_options), + testUtilEscape(data[i].data, length, escaped, sizeof(escaped)), + testUtilErrorName(data[i].ret), symbol->rows, symbol->width, symbol->errtxt, data[i].comment); + } else { + if (ret < 5) { + assert_equal(symbol->rows, data[i].expected_rows, "i:%d symbol->rows %d != %d (%s)\n", i, symbol->rows, data[i].expected_rows, data[i].data); + assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d (%s)\n", i, symbol->width, data[i].expected_width, data[i].data); + assert_zero(strcmp(symbol->errtxt, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->errtxt, data[i].expected); + } + } + + ZBarcode_Delete(symbol); + } + + testFinish(); +} + +static void test_input(int index, int generate, int debug) { + + testStart(""); + + int ret; + struct item { + int symbology; + int input_mode; + int eci; + unsigned char *data; + int ret; + int expected_eci; + int expected_rows; + int expected_width; + char *expected; + char *comment; + }; + // é U+00E9 (\351, 233), UTF-8 C3A9 + // β U+03B2 in ISO 8859-7 Greek (but not other ISO 8859 or Win page), in Shift JIS 0x83C0, UTF-8 CEB2 + struct item data[] = { + /* 0*/ { BARCODE_PDF417, UNICODE_MODE, -1, "é", 0, 0, 6, 103, "(12) 4 913 233 900 398 878 279 350 217 295 231 77", "" }, + /* 1*/ { BARCODE_PDF417, UNICODE_MODE, 3, "é", 0, 3, 7, 103, "(14) 6 927 3 913 233 900 162 81 551 529 607 384 164 108", "" }, + /* 2*/ { BARCODE_PDF417, UNICODE_MODE, 26, "é", 0, 26, 7, 103, "(14) 6 927 26 901 195 169 574 701 519 908 84 241 360 642", "" }, + /* 3*/ { BARCODE_PDF417, UNICODE_MODE, 9, "β", 0, 9, 7, 103, "(14) 6 927 9 913 226 900 487 92 418 278 838 500 576 84", "" }, + /* 4*/ { BARCODE_PDF417, UNICODE_MODE, -1, "β", ZINT_WARN_USES_ECI, 9, 7, 103, "Warning (14) 6 927 9 913 226 900 487 92 418 278 838 500 576 84", "" }, + /* 5*/ { BARCODE_PDF417, UNICODE_MODE, 3, "β", ZINT_ERROR_INVALID_DATA, 3, 0, 0, "Error 204: Invalid characters in input data", "" }, + /* 6*/ { BARCODE_PDF417, UNICODE_MODE, 899, "A", 0, 899, 7, 103, "(14) 6 927 899 900 29 900 727 69 915 482 371 771 641 35", "" }, + /* 7*/ { BARCODE_PDF417, UNICODE_MODE, 900, "A", 0, 900, 7, 103, "(14) 6 926 0 0 900 29 56 795 921 763 468 267 410 129", "" }, + /* 8*/ { BARCODE_PDF417, UNICODE_MODE, 810899, "A", 0, 810899, 7, 103, "(14) 6 926 899 899 900 29 847 901 749 718 89 792 660 273", "" }, + /* 9*/ { BARCODE_PDF417, UNICODE_MODE, 810900, "A", 0, 810900, 7, 103, "(14) 6 925 0 900 29 900 652 613 857 390 38 450 415 899", "" }, + /* 10*/ { BARCODE_PDF417, UNICODE_MODE, 811799, "A", 0, 811799, 7, 103, "(14) 6 925 899 900 29 900 456 300 328 160 510 753 157 159", "" }, + /* 11*/ { BARCODE_PDF417, UNICODE_MODE, 811800, "A", ZINT_ERROR_INVALID_OPTION, 811800, 0, 0, "Error 472: Invalid ECI", "" }, + /* 12*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, "é", 0, 0, 11, 38, "(11) 913 233 900 900 805 609 847 211 598 4 603", "" }, + /* 13*/ { BARCODE_MICROPDF417, UNICODE_MODE, 3, "é", 0, 3, 11, 38, "(11) 927 3 913 233 803 477 85 249 824 813 830", "" }, + /* 14*/ { BARCODE_MICROPDF417, UNICODE_MODE, 26, "é", 0, 26, 6, 82, "(18) 927 26 901 195 169 900 288 96 509 365 709 784 713 403 219 81 851 866", "" }, + /* 15*/ { BARCODE_MICROPDF417, UNICODE_MODE, 9, "β", 0, 9, 11, 38, "(11) 927 9 913 226 23 103 74 194 394 667 324", "" }, + /* 16*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, "β", ZINT_WARN_USES_ECI, 9, 11, 38, "Warning (11) 927 9 913 226 23 103 74 194 394 667 324", "" }, + /* 17*/ { BARCODE_MICROPDF417, UNICODE_MODE, 3, "β", ZINT_ERROR_INVALID_DATA, 3, 0, 0, "Error 204: Invalid characters in input data", "" }, + /* 18*/ { BARCODE_MICROPDF417, UNICODE_MODE, 899, "A", 0, 899, 11, 38, "(11) 927 899 900 29 533 437 884 3 617 241 747", "" }, + /* 19*/ { BARCODE_MICROPDF417, UNICODE_MODE, 900, "A", 0, 900, 6, 82, "(18) 926 0 0 900 29 900 913 543 414 141 214 886 461 1 419 422 54 495", "" }, + /* 20*/ { BARCODE_MICROPDF417, UNICODE_MODE, 810899, "A", 0, 810899, 6, 82, "(18) 926 899 899 900 29 900 351 555 241 509 787 583 3 326 41 628 534 151", "" }, + /* 21*/ { BARCODE_MICROPDF417, UNICODE_MODE, 810900, "A", 0, 810900, 11, 38, "(11) 925 0 900 29 233 533 43 483 708 659 704", "" }, + /* 22*/ { BARCODE_MICROPDF417, UNICODE_MODE, 811800, "A", ZINT_ERROR_INVALID_OPTION, 811800, 0, 0, "Error 473: Invalid ECI", "" }, + /* 23*/ { BARCODE_HIBC_PDF, UNICODE_MODE, -1, ",", ZINT_ERROR_INVALID_DATA, 0, 0, 0, "Error 203: Invalid characters in data", "" }, + /* 24*/ { BARCODE_HIBC_MICPDF, UNICODE_MODE, -1, ",", ZINT_ERROR_INVALID_DATA, 0, 0, 0, "Error 203: Invalid characters in data", "" }, + }; + int data_size = ARRAY_SIZE(data); + + char escaped[1024]; + + for (int i = 0; i < data_size; i++) { + + if (index != -1 && i != index) continue; + + struct zint_symbol *symbol = ZBarcode_Create(); + assert_nonnull(symbol, "Symbol not created\n"); + + symbol->debug = ZINT_DEBUG_TEST; // Needed to get codeword dump in errtxt + + int length = testUtilSetSymbol(symbol, data[i].symbology, data[i].input_mode, data[i].eci, -1 /*option_1*/, -1, -1, -1 /*output_options*/, data[i].data, -1, debug); + + ret = ZBarcode_Encode(symbol, 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); + + if (generate) { + printf(" /*%3d*/ { %s, %s, %d, \"%s\", %s, %d, %d, %d, \"%s\", \"%s\" },\n", + i, testUtilBarcodeName(data[i].symbology), testUtilInputModeName(data[i].input_mode), data[i].eci, + testUtilEscape(data[i].data, length, escaped, sizeof(escaped)), testUtilErrorName(data[i].ret), + symbol->eci, symbol->rows, symbol->width, symbol->errtxt, data[i].comment); + } else { + if (ret < 5) { + assert_equal(symbol->eci, data[i].expected_eci, "i:%d symbol->eci %d != %d (%s)\n", i, symbol->eci, data[i].expected_eci, data[i].data); + assert_equal(symbol->rows, data[i].expected_rows, "i:%d symbol->rows %d != %d (%s)\n", i, symbol->rows, data[i].expected_rows, data[i].data); + assert_equal(symbol->width, data[i].expected_width, "i:%d symbol->width %d != %d (%s)\n", i, symbol->width, data[i].expected_width, data[i].data); + assert_zero(strcmp(symbol->errtxt, data[i].expected), "i:%d strcmp(%s, %s) != 0\n", i, symbol->errtxt, data[i].expected); + } + } + + ZBarcode_Delete(symbol); + } + + testFinish(); +} + static void test_encode(int index, int generate, int debug) { testStart(""); + int do_bwipp = (debug & ZINT_DEBUG_TEST_BWIPP) && testUtilHaveGhostscript(); // Only do BWIPP test if asked, too slow otherwise + int ret; struct item { int symbology; @@ -133,28 +269,340 @@ static void test_encode(int index, int generate, int debug) { int expected_rows; int expected_width; + int bwipp_cmp; char *comment; char *expected; }; struct item data[] = { - /* 0*/ { BARCODE_PDF417, UNICODE_MODE, 2, 2, "PDF417 Symbology Standard", 0, 13, 103, "ISO 15438:2015 Figure 1 **NOT SAME** TODO: investigate", - "1111111101010100011110101001111000101011000110000001000011000110010011110101011110000111111101000101001" - "1111111101010100011111010100011000110110000011110101101000011100010011111101010011100111111101000101001" - "1111111101010100011101010111111000111010000111110101011001101111000011010100011111000111111101000101001" - "1111111101010100011111010111111010100000100010100001000001001000001010101111001111000111111101000101001" - "1111111101010100011010111000010000111001000110010001111001000001010011101011100011000111111101000101001" - "1111111101010100011110101111010000101110001000110001001111000010100011110101111000010111111101000101001" - "1111111101010100011010011100111100110000010010011001011100011101000011010011101111000111111101000101001" - "1111111101010100011110100101000000111111011000101101111010110011000010101111110011100111111101000101001" - "1111111101010100011010011011111100111110100001110101100011111001001010100110001111100111111101000101001" - "1111111101010100010100011101110000110110111100111101101100100100000011010001100011100111111101000101001" - "1111111101010100011010011100010000111000000101101001101101111100110011101001110011000111111101000101001" - "1111111101010100010100010001111000101010000111100001011111100011101010100011011111000111111101000101001" - "1111111101010100010100000101000000110000101011000001001000110000110010100001100000110111111101000101001" + /* 0*/ { BARCODE_PDF417, UNICODE_MODE, 1, 2, "PDF417 Symbology Standard", 0, 10, 103, 0, "ISO 15438:2015 Figure 1, same, BWIPP uses different encodation, same codeword count", + "1111111101010100011101010011100000111010110011110001110111011001100011110101011110000111111101000101001" + "1111111101010100011111010100110000110100001110001001111010001010000011111010100110000111111101000101001" + "1111111101010100011101010111111000101100110111100001110111111000101011010100111110000111111101000101001" + "1111111101010100010101111101111100100000100100000101000101000100000010101111001111000111111101000101001" + "1111111101010100011010111000100000111100100000101001001000011111011011010111000100000111111101000101001" + "1111111101010100011110101111010000100111100001010001100111110010010011110101111001000111111101000101001" + "1111111101010100010100111001110000101110001110100001111001101000111011010011101111000111111101000101001" + "1111111101010100011010111111011110111101011001100001010011111101110011010111111011110111111101000101001" + "1111111101010100011010011011111100110000101001111101101111100010001010100110011111000111111101000101001" + "1111111101010100010100011000001100100010111101111001100011100011001011010001100011100111111101000101001" + }, + /* 1*/ { BARCODE_PDF417, UNICODE_MODE, 1, 2, "PDF417", 0, 5, 103, 1, "ISO 15438:2015 Annex Q example for generating ECC", + "1111111101010100011110101011110000110101000110000001110111011001100011110101011110000111111101000101001" + "1111111101010100011111101010011100110100001110001001111010001010000011111101010111000111111101000101001" + "1111111101010100011101010111111000101100110011110001100011111001001011101010011111100111111101000101001" + "1111111101010100010101111001111000101011101110000001100001101000100010101111001111000111111101000101001" + "1111111101010100011101011100011000100001101011111101111110110001011011101011100110000111111101000101001" + }, + /* 2*/ { BARCODE_PDF417, UNICODE_MODE, 0, 1, "ABCDEFGHIJKLMNOPQRSTUVWXYZ ", 0, 17, 86, 1, "Text Compaction Alpha", + "11111111010101000111110101001111101101011001110000011101010111000000111111101000101001" + "11111111010101000111111010101110001111110101011100011110101000100000111111101000101001" + "11111111010101000110101011111000001010011001111100011101010111111000111111101000101001" + "11111111010101000111010010111000001101000001011000011010111101111100111111101000101001" + "11111111010101000111010111001100001010000111110011011110101110001110111111101000101001" + "11111111010101000111110101110000101011001110011111011110101111010000111111101000101001" + "11111111010101000101001110001110001100100001101110010100111011100000111111101000101001" + "11111111010101000101011111000011001101100111100100010101111110001110111111101000101001" + "11111111010101000101001101111100001001100001000111011010011011111100111111101000101001" + "11111111010101000110100011101111001001100111100111010100011000110000111111101000101001" + "11111111010101000111010011101100001001100101111110011110100111001110111111101000101001" + "11111111010101000110100010011111001000001010111100010100010001111000111111101000101001" + "11111111010101000110100000101100001000110011001000010100001100001100111111101000101001" + "11111111010101000111101000101000001110001100111010011111010001001100111111101000101001" + "11111111010101000111101000011110101100011110010011011101000011111010111111101000101001" + "11111111010101000110010110111000001100011000100001011100101000111000111111101000101001" + "11111111010101000101000111100100001110000101100010010100011110000100111111101000101001" + }, + /* 3*/ { BARCODE_PDF417, UNICODE_MODE, 1, 1, "abcdefghijklmnopqrstuvwxyz ", 0, 19, 86, 1, "Text Compaction Lower", + "11111111010101000110101000110000001101011001110000011101010111000000111111101000101001" + "11111111010101000111110101001100001100000101110010011111010100011000111111101000101001" + "11111111010101000110101011111000001111101011110110011010100111110000111111101000101001" + "11111111010101000111101001011110001010001110111000011010111101111100111111101000101001" + "11111111010101000110101110001000001010001111000001011010111000010000111111101000101001" + "11111111010101000111110101110000101110010011111001011110101111001000111111101000101001" + "11111111010101000110100111000111101011001111000111010100111011100000111111101000101001" + "11111111010101000110101111110111101111101100100100011110100101000000111111101000101001" + "11111111010101000101001101111100001011100100000011010100110011111000111111101000101001" + "11111111010101000101000111001110001100010001001100010100011000110000111111101000101001" + "11111111010101000110100111001000001110001001110011011010011100010000111111101000101001" + "11111111010101000110100010011111001101111000100110010100010000111100111111101000101001" + "11111111010101000111010000010111001000110111101110010100001100001100111111101000101001" + "11111111010101000111111010001011101100011011110010011110100010001000111111101000101001" + "11111111010101000111101000011110101000001100101110011010000010111110111111101000101001" + "11111111010101000111001011011110001000010010000001011100101000111000111111101000101001" + "11111111010101000101000111100010001111010000101000010100011110000010111111101000101001" + "11111111010101000111111001011101101010000001001111010010111001111110111111101000101001" + "11111111010101000111011010000110001000100111001110011110110100111000111111101000101001" + }, + /* 4*/ { BARCODE_PDF417, UNICODE_MODE, 1, 4, "0123456&\015\011,:#-.$/+%*=^ 789", 0, 5, 137, 1, "Text Compaction Mixed", + "11111111010101000111101010111100001110101100111100010000110111001100110101111001111101010001110111000011101010011100000111111101000101001" + "11111111010101000111111010100111001010001111000001011101101111001100110110011110010001110010000011010011111101010111000111111101000101001" + "11111111010101000110101001111100001100111010000111011011110010110000100000101011110001101111101010000011101010011111100111111101000101001" + "11111111010101000101011110011110001000010000100001010010011000011000110010000100110001000011000110010010101111101111100111111101000101001" + "11111111010101000111010111000110001001111001001111010000101111101100100011110010111101001111110110111011101011100110000111111101000101001" + }, + /* 5*/ { BARCODE_PDF417, UNICODE_MODE, 3, 2, ";<>@[\\]_'~!\015\011,:\012-.$/\"|*()?{", 0, 16, 103, 1, "Text Compaction Punctuation", + "1111111101010100011111010100111110111010110011110001000111011100100011110101011110000111111101000101001" + "1111111101010100011111010100001100111111010101110001101011111101111011110101000100000111111101000101001" + "1111111101010100011101010111111000101000001000111101011011001111000011010100001111100111111101000101001" + "1111111101010100011101001011100000110000110010100001100100001101110010101111001111000111111101000101001" + "1111111101010100011101011100000110110110011110010001110010000011010011110101110001110111111101000101001" + "1111111101010100011110101111010000110011101000011101101111001011000011101011111001000111111101000101001" + "1111111101010100010100111000111000110001101000100001000110011001000011010011101111000111111101000101001" + "1111111101010100011110100100100000111000110011101001110000010111011010101111110001110111111101000101001" + "1111111101010100011010011011111100110011111010100001001111000010010011111101001110110111111101000101001" + "1111111101010100011010001110111100110101000110000001100011010010000011010001100011100111111101000101001" + "1111111101010100011101001110000110110100111110011101001000011110100011110100111001110111111101000101001" + "1111111101010100010100010001111000110010011011111101000101000001111010100011001111100111111101000101001" + "1111111101010100011010000010110000110001011001110001100100010011000010100001100000110111111101000101001" + "1111111101010100011110100010000010110000010001110101111010011000110011111010001001100111111101000101001" + "1111111101010100011101000011111010111111010001101001011000010011100010010101111000000111111101000101001" + "1111111101010100011001011011100000110011001100001101100100101100000011110010100011110111111101000101001" + }, + /* 6*/ { BARCODE_PDF417, UNICODE_MODE, 2, 3, "12345678901234", 0, 5, 120, 1, "Numeric Compaction", + "111111110101010001111010101111000011101010001110000100111101111010001001011100001110011111010101111100111111101000101001" + "111111110101010001111110101000111011010000001110010111111011010011001111010100000010011111101010111000111111101000101001" + "111111110101010001010100111100000010111000110011100101110011000011101110001111110101011101010001111110111111101000101001" + "111111110101010001010111100111100010001100001100010100001100011101101110101100111100011010111100111110111111101000101001" + "111111110101010001110101110000110011000000101110010110001001110000101011001000111111011101011100110000111111101000101001" }, + /* 7*/ { BARCODE_PDF417, UNICODE_MODE, 1, 4, "\177\177\177\177\177\177\177\177\177\177\177", 0, 4, 137, 1, "Byte Compaction", + "11111111010101000111101010111100001101011011100000010000010000100010111001001100111101000010100001000011101010011100000111111101000101001" + "11111111010101000111110101001100001110010000111011010100111110000110111101001100001101111101000100011011111101010111000111111101000101001" + "11111111010101000110101001111100001010000001011110010100000010111100101000000101111001010000001011110011010100111110000111111101000101001" + "11111111010101000101011110011110001010001000001000011011000010100000111000110001001101100111000110010010101111101111100111111101000101001" + }, + /* 8*/ { BARCODE_PDF417, UNICODE_MODE, 1, 4, "\177\177\177\177\177\177\177\177\177\177\177\177", 0, 4, 137, 1, "Byte Compaction, mod 6 == 0 (924 emitted)", + "11111111010101000111101010111100001101011011100000011000111000110100111001001100111101000010100001000011101010011100000111111101000101001" + "11111111010101000111110101001100001110010000111011010100111110000110111101001100001101111001010010000011111101010111000111111101000101001" + "11111111010101000110101001111100001001110000100110010011000100001110101000011001111101101000101111100011010100111110000111111101000101001" + "11111111010101000101011110011110001101000100011000010011000111001100110001100001000101110100010111000010101111101111100111111101000101001" + }, + /* 9*/ { BARCODE_PDF417, UNICODE_MODE, -1, 5, "ABCDEF1234567890123\177\177\177\177VWXYZ", 0, 6, 154, 1, "Text, Numeric, Byte, Text", + "1111111101010100011110101011110000110101110111100001111010101111000010100111001110000110100000101100001001111011110100011110101001111000111111101000101001" + "1111111101010100011110101000010000111101011001100001010011110000100011111100011101010110000010111000101111001011011000011111101010111000111111101000101001" + "1111111101010100011101010011111100110011111101100101010000001011110010100000010111100101000000101111001010000001011110010101000011110000111111101000101001" + "1111111101010100010101111001111000100001100011001001000110111101110011110111101101100110111100111000101000011000110010011111010111111010111111101000101001" + "1111111101010100011010111000001000101111110101100001011111101011000011001011111001110111100100100100001011111101011000011101011100110000111111101000101001" + "1111111101010100011111010111100110110111110110011001101001011111000010101110011111100100100001000111101011000000101110011110101111101100111111101000101001" + }, + /* 10*/ { BARCODE_PDF417TRUNC, UNICODE_MODE, 1, 2, "PDF417 APK", 0, 6, 69, 0, "ISO 15438:2015 Figure G.1, same, BWIPP uses different encodation, same codeword count", + "111111110101010001111010101111000011010100001100000111011101100110001" + "111111110101010001111010100010000011010000111000100111101000101000001" + "111111110101010001110101011111100010110011011110000100111110011000101" + "111111110101010001010111100111100011001100100000010100001100011001001" + "111111110101010001111010111000111011011000001111010110010011101000001" + "111111110101010001111010111101000011110100111101000110010010011111001" + }, + /* 11*/ { BARCODE_PDF417TRUNC, UNICODE_MODE, 4, 4, "ABCDEFG", 0, 10, 103, 1, "", + "1111111101010100011101010011100000110101000011000001111010101111000010100111001110000110100000101100001" + "1111111101010100011110101000000100110100000011100101011111101011000010111111010110000101111110101100001" + "1111111101010100011010100111110000101111001100011001000001111010100010011111001100100111001011111001001" + "1111111101010100010101111101111100100001011000110001100011100110010011011011100111000101111000111100101" + "1111111101010100011101011110111000111110011010000101110000010110010011100100011001000100011111001011101" + "1111111101010100011110101111001000111111010111011001110111111010100010100000010011110100111100110001101" + "1111111101010100010100111001110000100001101101000001101100110000110011011000110011000101000000101000001" + "1111111101010100011110100100010000111101001000010001111101011011100011100100001100100101001111100011001" + "1111111101010100010100110011111000100110000110111101100111000010111010010001011110000110011111010001001" + "1111111101010100010100011000001100110001101010000001100011000110011011001001101110000111110111110101001" + }, + /* 12*/ { BARCODE_HIBC_PDF, UNICODE_MODE, -1, 3, "H123ABC01234567890D", 0, 8, 120, 0, "BWIPP uses different encodation, same codeword count but zint half-pad shorter", + "111111110101010001111101010111110011101011001111000100000100010010001110001110100010011111010101111100111111101000101001" + "111111110101010001111110101000111011110000010001010110101111110111101111100011101101011110101001000000111111101000101001" + "111111110101010001010100111100000011111010111101100100001111000101001100101000011111011101010001111110111111101000101001" + "111111110101010001101011110011111010000100000101000110001110110010001100100101100000011010111100111110111111101000101001" + "111111110101010001110101110000110010111111010110000110100111100110001011111101011000011110101110011100111111101000101001" + "111111110101010001111101011110110011000111110010010110010100111110001000001001001111011101011111010000111111101000101001" + "111111110101010001110100111011111010100110001100000110100011100111101111010010111100011101001110111110111111101000101001" + "111111110101010001111101001011000011100001001100100111010000011001001111011000110100010101111110111000111111101000101001" + }, + /* 13*/ { BARCODE_HIBC_PDF, UNICODE_MODE, 1, 3, "A123BJC5D6E71", 0, 6, 120, 1, "BWIPP example", + "111111110101010001111010101111000011110101101111100100000100010010001000011011100110011111010101111100111111101000101001" + "111111110101010001111010100010000011110000010001010110101111110111101111000001000101011111101010111000111111101000101001" + "111111110101010001010100111100000010110001100011110101111110111101101000111100011011010101000111100000111111101000101001" + "111111110101010001010111100111100011100011101001000100001101111011101110001110100010011010111100111110111111101000101001" + "111111110101010001111010111000111011010111110011100110100000011100101111110101000111011101011100110000111111101000101001" + "111111110101010001111101011110110010011100110011100100011110110011001011001011100000011110101111000100111111101000101001" + }, + /* 14*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, 1, "ABCDEFGHIJKLMNOPQRSTUV", 0, 20, 38, 1, "ISO 24728:2006 Figure 1 1st 1x20, same", + "11110101001000011000110010011110101001" + "11100101001111110101011100011100101001" + "11101101001010011001111100011101101001" + "11101001001101000001011000011101001001" + "11101001101010000111110011011101001101" + "11101011101011001110011111011101011101" + "11101011001100100001101110011101011001" + "11101010001101100111100100011101010001" + "11001010001001100001000111011001010001" + "11001011001001100111100111011001011001" + "11001011101001100101111110011001011101" + "11001001101000001010111100011001001101" + "11001101101111001100100111011001101101" + "11101101101011100111111010011101101101" + "11100101101110011110100111011100101101" + "11000101101110001010011100011000101101" + "11000101001100010111100110011000101001" + "11001101001000011001000111011001101001" + "11011101001111011111011010011011101001" + "11011001001100010001110100011011001001" + }, + /* 15*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, 2, "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCD", 0, 20, 55, 1, "ISO 24728:2006 Figure 1 2nd 2x20, same", + "1111010100100001100011001001111010101111000011110101001" + "1110010100110101111110111101111101000100110011100101001" + "1110110100101101100111100001011001110011111011101101001" + "1110100100110010000110111001110001011001111011101001001" + "1110100110111001000001101001001101011111100011101001101" + "1110101110110111100101100001000001010111100011101011101" + "1110101100100011001100100001100111001110011011101011001" + "1110101000111111010101110001101011111101111011101010001" + "1100101000101000001000111101011011001111000011001010001" + "1100101100110010001001100001100100001101110011001011001" + "1100101110110110011110010001110010000011010011001011101" + "1100100110110011101000011101101111001011000011001001101" + "1100110110110001101000100001000110011001000011001101101" + "1110110110111000110011101001111110101011100011101101101" + "1110010110101001100111110001000110010011100011100101101" + "1100010110110110011011000001100110100010000011000101101" + "1100010100111111001010011101110000100110100011000101001" + "1100110100111001111100101101111110010011010011001101001" + "1101110100111010110011110001000001001101100011011101001" + "1101100100111100110110100001001001111001000011011001001" + }, + /* 16*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, 3, "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMN", 0, 20, 82, 1, "ISO 24728:2006 Figure 1 3rd 3x20", + "1100100010100001100011001001011110010111101010111100001010011100111000011100101101" + "1110100010111110100010011001011110110101000011111001101001011110010000011000101101" + "1110110010111100010111101001001110110110111011001111001001100001000111011000101001" + "1100110010100110011110011101001110100111001100001001101100011010001000011001101001" + "1101110010110000101111011001001100100111000110011101001111110101011100011011101001" + "1101111010101001100111110001001100110101000001000111101011011001111000011011001001" + "1100111010110010001001100001001000110110010000110111001110001011001111011011001101" + "1110111010111001000001101001001000010100110101111110001001100101111110011011011101" + "1110011010100000101011110001011000010110111110101000001101111100010001011011011001" + "1111011010111101010111100001011100010101001110011100001101000001011000011011010001" + "1111001010101000011111001101011100110100101111001000001110110111100110011010010001" + "1110001010110111011001111001011100100101111100110010001110011111010110011010110001" + "1100001010111100111101010001011101100111100111100101001111101110100111011010111001" + "1100011010111001101110010001001101100101001111000001001111010001100110011010111101" + "1100010010110010001111110101000101100110011100001011101111001000111101011010011101" + "1110010010100110001100000101000101000110111101110001001101100110110000011010011001" + "1111010010100111010001111101001101000100110111110100001111001110111010011010001001" + "1111010110101100100000011101011101000110001101000111101000000100101111011010001101" + "1111010100101111011110100001011001000111110011010111101011110111110110011010000101" + "1110010100110010001111011001011001100111000010111011001110001011100110011011000101" + }, + /* 17*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, 4, "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZAB", 0, 20, 99, 1, "ISO 24728:2006 Figure 1 4th 4x20, same", + "110010001010000110001100100111101010111100001011110010101001110011100001101000001011000011100101101" + "111010001010100001111100110100101111001000001011110110111011011110011001101100111100100011000101101" + "111011001010011000010001110110011101000011101001110110110111100101100001000001010111100011000101001" + "110011001010001100110010000110011100111001101001110100111101010111100001010011100111000011001101001" + "110111001011111010001001100101000011111001101001100100100101111001000001110110111100110011011101001" + "110111101011011101100111100100110000100011101001100110110011101000011101101111001011000011011001001" + "110011101011000110100010000100011001100100001001000110110011100111001101111010101111000011011001101" + "111011101011010111111011110111110100010011001001000010101000011111001101001011110010000011011011101" + "111001101011110001011110100110111011001111001011000010100110000100011101100111010000111011011011001" + "111101101011100110000100110110001101000100001011100010100011001100100001100111001110011011011010001" + "111100101011111101010111000110101111110111101011100110111110100010011001010000111110011011010010001" + "111000101010110011100111110111100010111101001011100100110111011001111001001100001000111011010110001" + "110000101010011001111001110111001100001001101011101100110001101000100001000110011001000011010111001" + "110001101011100011001110100111111010101110001001101100111101001110111001011111011001111011010111101" + "110001001011110101111101100101111001110011101000101100101110110111000001000010000101111011010011101" + "111001001010000010100000100111000111010010001000101000110010000010110001101100010000001011010011001" + "111101001011110111001110100110000010011100101001101000111101100110001001011110100001111011010001001" + "111101011010000001010011110100110110001111001011101000110000111100101101111010011110010011010001101" + "111101010011100011101010000110001011101111001011001000111110111101011001100101110111100011010000101" + "111001010010001000001111010111100010100001001011001100100111101101111101001110100111110011011000101" + }, + /* 18*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, 1, "123456789012345", 0, 14, 38, 1, "Number Compaction", + "11101110101011111101001100011101110101" + "11100110101110101011111100011100110101" + "11110110101000001011001100011110110101" + "11110010101111100100110111011110010101" + "11100010101000111110110010011100010101" + "11000010101010000010100000011000010101" + "11000110101110001100111010011000110101" + "11000100101000100001001111011000100101" + "11100100101011110011110010011100100101" + "11110100101110011000011101011110100101" + "11110101101000101000001111011110101101" + "11110101001111001010011110011110101001" + "11100101001101011110000110011100101001" + "11101101001101000111111001011101101001" + }, + /* 19*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, 2, "\177\177\177", 0, 8, 55, 1, "Byte Compaction", + "1100100010100000100001000101010000010010000011001000101" + "1110100010111110100010001101111101000100011011101000101" + "1110110010110001111100100101100011111001001011101100101" + "1100110010100001100011001001000011000110010011001100101" + "1101110010111001000111011001011011111101100011011100101" + "1101111010111010011111101101001110010011000011011110101" + "1100111010111001111001100101000001001101100011001110101" + "1110111010111000101111011101110001000011010011101110101" + }, + /* 20*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, 2, "\177\177\177\177\177\177", 0, 8, 55, 1, "Byte Compaction, mod 6 == 0 (924 emitted)", + "1100100010110001110001101001110010011001111011001000101" + "1110100010100010001111010001110010000111011011101000101" + "1110110010101000011001111101101000101111100011101100101" + "1100110010100001100011001001000011000110010011001100101" + "1101110010101110001001111101101000111000001011011100101" + "1101111010100011001101111001010010000111100011011110101" + "1100111010100100010000100001110111101100001011001110101" + "1110111010111110011010100001101100001111010011101110101" + }, + /* 21*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, 3, "ABCDEFG\177\177\177", 0, 8, 82, 1, "Text & Byte Compaction", + "1100111010100001100011001001000010110111101010111100001010011100111000011001110101" + "1110111010111110100010011001000010010110100000011100101101111110101110011101110101" + "1110011010101000000101111001000011010101000000101111001010000001011110011100110101" + "1111011010100001100011001001000111010100100001010000001111001110100011011110110101" + "1111001010111000001001100101000110010111010011000010001110100110000100011110010101" + "1110001010101111010001000001000100010101100010000011101000000111001011011100010101" + "1100001010111110111010111001001100010110011100011000101101100001100110011000010101" + "1100011010110100011100001001001110010110110000111101001100011011110010011000110101" + }, + /* 22*/ { BARCODE_MICROPDF417, UNICODE_MODE, -1, 4, "\177\177\177abcdefgh1234567890123", 0, 8, 99, 1, "Byte & Text & Numeric Compaction", + "110011101010000010000100010101000001001000001000010110101000001001000001010000010010000011001110101" + "111011101010111111010110000110000010111001001000010010111101011100111001110100111001100011101110101" + "111001101011111001011110110101100110011110001000011010100001111000101001111110101100010011100110101" + "111101101011010000100001100100000100110110001000111010100000101101100001001001110011100011110110101" + "111100101010111111010110000101111110101100001000110010101111101011100001110011000111010011110010101" + "111000101010111111011110110110111111000110101000100010100111000000101101001111101101000011100010101" + "110000101011000011010000100100000101101100001001100010101110111110111001111001110010110011000010101" + "110001101011101110111100010100100011110100001001110010100000101111000101111001010010000011000110101" + }, + /* 23*/ { BARCODE_HIBC_MICPDF, UNICODE_MODE, -1, 4, "H123ABC01234567890D", 0, 8, 99, 0, "BWIPP uses different encodation, same codeword count but zint full-pad shorter", + "110011101010000110001100100100000100010010001000010110111000111010001001000001001100011011001110101" + "111011101011010111111011110111110001110110101000010010111101011100111001011111101001100011101110101" + "111001101011001010000111110100011110101000001000011010100111110001101001011011000111100011100110101" + "111101101010000110001100100101000010001000001000111010100001100011001001000011000110010011110110101" + "111100101010111111010110000101111110101100001000110010111001001100001001111110001101011011110010101" + "111000101010001100101110000110010010011111001000100010100111100001101101111110101100010011100010101" + "110000101010110110001000000111000101100111101001100010110111101110000101100010101100000011000010101" + "110001101011110110000011010111100100001101101001110010101101011111100001111001000110011011000110101" + }, + /* 24*/ { BARCODE_HIBC_MICPDF, UNICODE_MODE, -1, 1, "/EAH783", 0, 17, 38, 1, "HIBC Provider Applications Standard (PAS) example", + "11001101001100011111001001011001101001" + "11011101001000001000100100011011101001" + "11011001001000100011110100011011001001" + "11011001101111010000111101011011001101" + "11011011101101100100010000011011011101" + "11011011001111001010000100011011011001" + "11011010001010000110011111011011010001" + "11010010001101001100001110011010010001" + "11010110001011111101011000011010110001" + "11010111001100011111001001011010111001" + "11010111101100110001000010011010111101" + "11010011101100001000111001011010011101" + "11010011001011110111000111011010011001" + "11010001001110001100100011011010001001" + "11010001101110010000110100011010001101" + "11010000101101100100001111011010000101" + "11011000101110111000100010011011000101" + }, }; int data_size = sizeof(data) / sizeof(struct item); + char escaped[1024]; + char bwipp_buf[8192]; + char bwipp_msg[1024]; + for (int i = 0; i < data_size; i++) { if (index != -1 && i != index) continue; @@ -178,11 +626,12 @@ static void test_encode(int index, int generate, int debug) { assert_equal(ret, data[i].ret, "i:%d ZBarcode_Encode ret %d != %d (%s)\n", i, ret, data[i].ret, symbol->errtxt); if (generate) { - printf(" /*%3d*/ { %s, %s, %d, %d, \"%s\", %s, %d, %d, \"%s\",\n", + printf(" /*%3d*/ { %s, %s, %d, %d, \"%s\", %s, %d, %d, %d, \"%s\",\n", i, testUtilBarcodeName(data[i].symbology), testUtilInputModeName(data[i].input_mode), data[i].option_1, data[i].option_2, - data[i].data, testUtilErrorName(data[i].ret), symbol->rows, symbol->width, data[i].comment); + testUtilEscape(data[i].data, length, escaped, sizeof(escaped)), testUtilErrorName(data[i].ret), + symbol->rows, symbol->width, data[i].bwipp_cmp, data[i].comment); testUtilModulesDump(symbol, " ", "\n"); - printf(" },\n"); + printf(" },\n"); } else { if (ret < 5) { assert_equal(symbol->rows, data[i].expected_rows, "i:%d symbol->rows %d != %d (%s)\n", i, symbol->rows, data[i].expected_rows, data[i].data); @@ -193,6 +642,19 @@ static void test_encode(int index, int generate, int debug) { ret = testUtilModulesCmp(symbol, data[i].expected, &width, &row); assert_zero(ret, "i:%d testUtilModulesCmp ret %d != 0 width %d row %d (%s)\n", i, ret, width, row, data[i].data); } + + if (do_bwipp && testUtilCanBwipp(symbol->symbology, data[i].option_1, data[i].option_2, -1, debug)) { + if (!data[i].bwipp_cmp) { + if (debug & ZINT_DEBUG_TEST_PRINT) printf("%d: %s not BWIPP compatible (%s)\n", i, testUtilBarcodeName(symbol->symbology), data[i].comment); + } else { + ret = testUtilBwipp(symbol, data[i].option_1, data[i].option_2, -1, data[i].data, length, NULL, bwipp_buf, sizeof(bwipp_buf)); + assert_zero(ret, "i:%d %s testUtilBwipp ret %d != 0\n", i, testUtilBarcodeName(data[i].symbology), ret); + + ret = testUtilBwippCmp(symbol, bwipp_msg, bwipp_buf, data[i].expected); + assert_zero(ret, "i:%d %s testUtilBwippCmp %d != 0 %s\n actual: %s\nexpected: %s\n", + i, testUtilBarcodeName(data[i].symbology), ret, bwipp_msg, bwipp_buf, data[i].expected); + } + } } } @@ -373,8 +835,8 @@ static void test_fuzz(int index, int debug) { "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" - "ABCDEFGHIJKLMNOPQRSTUVWXYZABCD", - 1850, 0, 0 }, // Max text with ECC 0 + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEF", + 1852, 0, 0 }, // Max text with ECC 0 Note: before default Text mode change the max was 1850 as given in ISO 15438:2015 /* 7*/ { BARCODE_PDF417, "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -390,8 +852,8 @@ static void test_fuzz(int index, int debug) { "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" - "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDE", - 1851, 0, ZINT_ERROR_TOO_LONG }, + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFG", + 1853, 0, ZINT_ERROR_TOO_LONG }, /* 8*/ { BARCODE_PDF417, "\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240" "\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240\240" @@ -496,6 +958,8 @@ int main(int argc, char *argv[]) { testFunction funcs[] = { /* name, func, has_index, has_generate, has_debug */ { "test_options", test_options, 1, 0, 1 }, + { "test_reader_init", test_reader_init, 1, 1, 1 }, + { "test_input", test_input, 1, 1, 1 }, { "test_encode", test_encode, 1, 1, 1 }, { "test_fuzz", test_fuzz, 1, 0, 1 }, }; diff --git a/backend/tests/test_raster.c b/backend/tests/test_raster.c index 113b10db..bdfac75d 100644 --- a/backend/tests/test_raster.c +++ b/backend/tests/test_raster.c @@ -173,7 +173,7 @@ static void test_buffer(int index, int generate, int debug) { /* 54*/ { BARCODE_PZN, "123456", "", 50, 1, 142, 284, 118 }, /* 55*/ { BARCODE_PHARMA_TWO, "12345678", "", 10, 2, 29, 58, 20 }, /* 56*/ { BARCODE_PDF417, "0000000000", "", 21, 7, 103, 206, 42 }, - /* 57*/ { BARCODE_PDF417TRUNC, "0000000000", "", 21, 7, 68, 136, 42 }, + /* 57*/ { BARCODE_PDF417TRUNC, "0000000000", "", 21, 7, 69, 138, 42 }, /* 58*/ { BARCODE_MAXICODE, "0000000000", "", 165, 33, 30, 300, 300 }, // Differs from vector /* 59*/ { BARCODE_QRCODE, "1234567890AB", "", 21, 21, 21, 42, 42 }, /* 60*/ { BARCODE_CODE128B, "0000000000", "", 50, 1, 145, 290, 118 }, diff --git a/backend/tests/test_rss.c b/backend/tests/test_rss.c index cbbbd5c3..001f32f5 100644 --- a/backend/tests/test_rss.c +++ b/backend/tests/test_rss.c @@ -589,7 +589,7 @@ static void test_examples(int index, int generate, int debug) { "00001000111010000101000101010101010100001011000110000" "01000111000101111010011000000000101011110100111000010" }, - /* 51*/ { BARCODE_RSS_EXPSTACK, 6, "[01]98898765432106[3202]012345[15]991231[3203]001234[17]010203", 5, 298, "#200 David Gredler mostly empty last row, 16 chars, 2 rows, bottom row 4 chars", + /* 51*/ { BARCODE_RSS_EXPSTACK, 6, "[01]98898765432106[3202]012345[15]991231[3203]001234[17]010203", 5, 298, "#200 Daniel Gredler mostly empty last row, 16 chars, 2 rows, bottom row 4 chars", "0100011101110001011011111111000010110000100101111101101000000110001010111100000000101001110000001001010011111011100110001111110000101110101000011000011010011100011000101111000000111001111000111101010111110010110000100011110000001010110010000010000111011111000100101011111100001110011110011000100101" "0000100010001110100100000000101001001111011010000010010111111001110101000010101010010110001111110110101100000100011001010000001010010001010111100111100101100011100111010000101010000110000111000010101000001101001111010100001010100101001101111101111000100000111011010100000010100001100001100111010000" "0000010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010000" diff --git a/backend/tests/test_vector.c b/backend/tests/test_vector.c index bddf4b89..4b0e5293 100644 --- a/backend/tests/test_vector.c +++ b/backend/tests/test_vector.c @@ -195,7 +195,7 @@ static void test_buffer_vector(int index, int generate, int debug) { /* 54*/ { BARCODE_PZN, "123456", "", 50, 1, 142, 284, 118 }, /* 55*/ { BARCODE_PHARMA_TWO, "12345678", "", 10, 2, 29, 58, 20 }, /* 56*/ { BARCODE_PDF417, "0000000000", "", 21, 7, 103, 206, 42 }, - /* 57*/ { BARCODE_PDF417TRUNC, "0000000000", "", 21, 7, 68, 136, 42 }, + /* 57*/ { BARCODE_PDF417TRUNC, "0000000000", "", 21, 7, 69, 138, 42 }, /* 58*/ { BARCODE_MAXICODE, "0000000000", "", 165, 33, 30, 74, 72 }, // Differs from raster /* 59*/ { BARCODE_QRCODE, "1234567890AB", "", 21, 21, 21, 42, 42 }, /* 60*/ { BARCODE_CODE128B, "0000000000", "", 50, 1, 145, 290, 118 }, diff --git a/backend/tests/testcommon.c b/backend/tests/testcommon.c index 62d456ea..c15095ec 100644 --- a/backend/tests/testcommon.c +++ b/backend/tests/testcommon.c @@ -1522,8 +1522,8 @@ static char *testUtilBwippName(int symbology, int option_1, int option_2, int op { "pzn", BARCODE_PZN, 52, 0, 0, 0, 0, 0, }, { "pharmacode2", BARCODE_PHARMA_TWO, 53, 0, 0, 0, 0, 0, }, { "", -1, 54, 0, 0, 0, 0, 0, }, - { "pdf417", BARCODE_PDF417, 55, 0, 0, 0, 0, 0, }, - { "pdf417compact", BARCODE_PDF417TRUNC, 56, 0, 0, 0, 0, 0, }, + { "pdf417", BARCODE_PDF417, 55, 1, 1, 0, 0, 0, }, + { "pdf417compact", BARCODE_PDF417TRUNC, 56, 1, 1, 0, 0, 0, }, { "maxicode", BARCODE_MAXICODE, 57, 0, 0, 0, 0, 0, }, { "qrcode", BARCODE_QRCODE, 58, 0, 0, 0, 0, 0, }, { "", -1, 59, 0, 0, 0, 0, 0, }, @@ -1551,7 +1551,7 @@ static char *testUtilBwippName(int symbology, int option_1, int option_2, int op { "databarexpandedstacked", BARCODE_RSS_EXPSTACK, 81, 0, 1, 0, 0, 1, }, { "planet", BARCODE_PLANET, 82, 0, 0, 0, 0, 0, }, { "", -1, 83, 0, 0, 0, 0, 0, }, - { "micropdf417", BARCODE_MICROPDF417, 84, 0, 0, 0, 0, 0, }, + { "micropdf417", BARCODE_MICROPDF417, 84, 0, 1, 0, 0, 0, }, { "onecode", BARCODE_ONECODE, 85, 0, 0, 0, 0, 0, }, { "plessey", BARCODE_PLESSEY, 86, 0, 0, 0, 0, 0, }, { "telepennumeric", BARCODE_TELEPEN_NUM, 87, 0, 0, 0, 0, 0, }, @@ -1573,9 +1573,9 @@ static char *testUtilBwippName(int symbology, int option_1, int option_2, int op { "", -1, 103, 0, 0, 0, 0, 0, }, { "hibcqrcode", BARCODE_HIBC_QR, 104, 0, 0, 0, 0, 0, }, { "", -1, 105, 0, 0, 0, 0, 0, }, - { "hibcpdf417", BARCODE_HIBC_PDF, 106, 0, 0, 0, 0, 0, }, + { "hibcpdf417", BARCODE_HIBC_PDF, 106, 1, 1, 0, 0, 0, }, { "", -1, 107, 0, 0, 0, 0, 0, }, - { "hibcmicropdf417", BARCODE_HIBC_MICPDF, 108, 0, 0, 0, 0, 0, }, + { "hibcmicropdf417", BARCODE_HIBC_MICPDF, 108, 0, 1, 0, 0, 0, }, { "", -1, 109, 0, 0, 0, 0, 0, }, { "hibccodablockf", BARCODE_HIBC_BLOCKF, 110, 1, 1, 0, 0, 0, }, { "", -1, 111, 0, 0, 0, 0, 0, }, @@ -1691,7 +1691,9 @@ static char *testUtilBwippEscape(char *bwipp_data, int bwipp_data_size, const ch *parse = 0; while (b < be && d < de) { - if (*d < 0x20 || *d >= 0x7F || *d == '\'') { /* Escape single quote also to avoid having to do proper shell escaping TODO: proper shell escaping */ + /* Have to escape double quote otherwise Ghostscript gives "Unterminated quote in @-file" for some reason */ + /* Escape single quote also to avoid having to do proper shell escaping TODO: proper shell escaping */ + if (*d < 0x20 || *d >= 0x7F || *d == '^' || *d == '"' || *d == '\'') { sprintf(b, "^%03u", *d++); b += 4; *parse = 1; @@ -1873,6 +1875,17 @@ int testUtilBwipp(const struct zint_symbol *symbol, int option_1, int option_2, } bwipp_opts = bwipp_opts_buf; /* Set always as option_2 == 2 is bwipp default */ } + } else if (symbology == BARCODE_PDF417 || symbology == BARCODE_PDF417TRUNC || symbology == BARCODE_HIBC_PDF + || symbology == BARCODE_MICROPDF417 || symbology == BARCODE_HIBC_MICPDF) { + for (r = 0; r < symbol->rows; r++) bwipp_row_height[r] = 1; /* Change from 3 */ + if (option_1 >= 0) { + sprintf(bwipp_opts_buf + (int) strlen(bwipp_opts_buf), "%seclevel=%d", strlen(bwipp_opts_buf) ? " " : "", option_1); + bwipp_opts = bwipp_opts_buf; + } + if (option_2 > 0) { + sprintf(bwipp_opts_buf + (int) strlen(bwipp_opts_buf), "%scolumns=%d", strlen(bwipp_opts_buf) ? " " : "", option_2); + bwipp_opts = bwipp_opts_buf; + } } } } diff --git a/backend/tests/tools/run_bwipp_tests.sh b/backend/tests/tools/run_bwipp_tests.sh index fb779d5a..79f1be28 100755 --- a/backend/tests/tools/run_bwipp_tests.sh +++ b/backend/tests/tools/run_bwipp_tests.sh @@ -6,6 +6,7 @@ ./test_code128 -f encode -d $(expr 128 + 16) ./test_composite -d $(expr 128 + 16) ./test_gs1 -f gs1_reduce -d $(expr 128 + 16) +./test_pdf417 -f encode -d $(expr 128 + 16) ./test_rss -d $(expr 128 + 16) ./test_telepen -f encode -d $(expr 128 + 16) ./test_upcean -f encode -d $(expr 128 + 16) diff --git a/docs/manual.txt b/docs/manual.txt index daddb9b0..8afccfc6 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -283,7 +283,7 @@ Numeric Value | Barcode Name 52 | PZN 53 | Pharmacode Two-Track 55 | PDF417 -56 | PDF417 Truncated +56 | Compact PDF417 57 | Maxicode 58 | QR Code 60 | Code 128 (Subset B) @@ -441,7 +441,9 @@ DotCode, QR Code and Ultracode. HIBC data may also be encoded in the symbologies Code 39, Code128, Codablock-F, Data Matrix, QR Code, PDF417 and Aztec Code. Within this mode, the leading '+' -and the check character are automatically added. +and the check character are automatically added, conforming to HIBC Labeler +Identification Code (HIBC LIC). For HIBC Provider Applications Standard +(HIBC PAS), preface the data with a slash "/". The --binary option encodes the input data as given. Automatic code page translations to ECI pages is disabled. This may be used for raw binary @@ -1017,7 +1019,7 @@ Value | 52 | BARCODE_PZN | PZN 53 | BARCODE_PHARMA_TWO | Pharmacode Two-Track 55 | BARCODE_PDF417 | PDF417 -56 | BARCODE_PDF417TRUNC | PDF417 Truncated +56 | BARCODE_PDF417TRUNC | Compact PDF417 (Truncated PDF417) 57 | BARCODE_MAXICODE | Maxicode 58 | BARCODE_QRCODE | QR Code 60 | BARCODE_CODE128B | Code 128 (Subset B) @@ -1618,7 +1620,7 @@ digit to the encoded data. 6.2.5 Compact PDF417 -------------------- -Also known as truncated PDF417. Options are the same as for PDF417 above. +Previously known as Truncated PDF417. Options are the same as for PDF417 above. 6.2.6 MicroPDF417 (ISO 24728) ----------------------------- diff --git a/frontend/main.c b/frontend/main.c index eb6aacd1..58b72d88 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -41,7 +41,7 @@ static void types(void) { printf( " 1: Code 11 52: PZN 97: Micro QR Code\n" " 2: Standard 2of5 53: Pharma Two-Track 98: HIBC Code 128\n" " 3: Interleaved 2of5 55: PDF417 99: HIBC Code 39\n" - " 4: IATA 2of5 56: PDF417 Trunc 102: HIBC Data Matrix\n" + " 4: IATA 2of5 56: Compact PDF417 102: HIBC Data Matrix\n" " 6: Data Logic 57: Maxicode 104: HIBC QR Code\n" " 7: Industrial 2of5 58: QR Code 106: HIBC PDF417\n" " 8: Code 39 60: Code 128-B 108: HIBC MicroPDF417\n" diff --git a/frontend_qt/grpPDF417.ui b/frontend_qt/grpPDF417.ui index 8513a1a7..50c7d903 100644 --- a/frontend_qt/grpPDF417.ui +++ b/frontend_qt/grpPDF417.ui @@ -165,47 +165,47 @@ - 2 words + 0 (2 words) - 4 words + 1 (4 words) - 8 words + 2 (8 words) - 16 words + 3 (16 words) - 32 words + 4 (32 words) - 64 words + 5 (64 words) - 128 words + 6 (128 words) - 256 words + 7 (256 words) - 512 words + 8 (512 words) @@ -241,7 +241,7 @@ - Truncated + Compact PDF417