diff --git a/backend/dotcode.c b/backend/dotcode.c index ab81b49d..00195dc4 100644 --- a/backend/dotcode.c +++ b/backend/dotcode.c @@ -52,101 +52,101 @@ /* DotCode symbol character dot patterns, from Annex C */ static const int dot_patterns[113] = { - 0x155,0x0ab,0x0ad,0x0b5,0x0d5,0x156,0x15a,0x16a,0x1aa,0x0ae, - 0x0b6,0x0ba,0x0d6,0x0da,0x0ea,0x12b,0x12d,0x135,0x14b,0x14d, - 0x153,0x159,0x165,0x169,0x195,0x1a5,0x1a9,0x057,0x05b,0x05d, - 0x06b,0x06d,0x075,0x097,0x09b,0x09d,0x0a7,0x0b3,0x0b9,0x0cb, - 0x0cd,0x0d3,0x0d9,0x0e5,0x0e9,0x12e,0x136,0x13a,0x14e,0x15c, - 0x166,0x16c,0x172,0x174,0x196,0x19a,0x1a6,0x1ac,0x1b2,0x1b4, - 0x1ca,0x1d2,0x1d4,0x05e,0x06e,0x076,0x07a,0x09e,0x0bc,0x0ce, - 0x0dc,0x0e6,0x0ec,0x0f2,0x0f4,0x117,0x11b,0x11d,0x127,0x133, - 0x139,0x147,0x163,0x171,0x18b,0x18d,0x193,0x199,0x1a3,0x1b1, - 0x1c5,0x1c9,0x1d1,0x02f,0x037,0x03b,0x03d,0x04f,0x067,0x073, - 0x079,0x08f,0x0c7,0x0e3,0x0f1,0x11e,0x13c,0x178,0x18e,0x19c, - 0x1b8,0x1c6,0x1cc + 0x155, 0x0ab, 0x0ad, 0x0b5, 0x0d5, 0x156, 0x15a, 0x16a, 0x1aa, 0x0ae, + 0x0b6, 0x0ba, 0x0d6, 0x0da, 0x0ea, 0x12b, 0x12d, 0x135, 0x14b, 0x14d, + 0x153, 0x159, 0x165, 0x169, 0x195, 0x1a5, 0x1a9, 0x057, 0x05b, 0x05d, + 0x06b, 0x06d, 0x075, 0x097, 0x09b, 0x09d, 0x0a7, 0x0b3, 0x0b9, 0x0cb, + 0x0cd, 0x0d3, 0x0d9, 0x0e5, 0x0e9, 0x12e, 0x136, 0x13a, 0x14e, 0x15c, + 0x166, 0x16c, 0x172, 0x174, 0x196, 0x19a, 0x1a6, 0x1ac, 0x1b2, 0x1b4, + 0x1ca, 0x1d2, 0x1d4, 0x05e, 0x06e, 0x076, 0x07a, 0x09e, 0x0bc, 0x0ce, + 0x0dc, 0x0e6, 0x0ec, 0x0f2, 0x0f4, 0x117, 0x11b, 0x11d, 0x127, 0x133, + 0x139, 0x147, 0x163, 0x171, 0x18b, 0x18d, 0x193, 0x199, 0x1a3, 0x1b1, + 0x1c5, 0x1c9, 0x1d1, 0x02f, 0x037, 0x03b, 0x03d, 0x04f, 0x067, 0x073, + 0x079, 0x08f, 0x0c7, 0x0e3, 0x0f1, 0x11e, 0x13c, 0x178, 0x18e, 0x19c, + 0x1b8, 0x1c6, 0x1cc }; -int get_dot (char Dots[], int Hgt, int Wid, int x, int y) { +int get_dot(char Dots[], int Hgt, int Wid, int x, int y) { int retval = 0; - + if ((x >= 0) && (x < Wid) && (y >= 0) && (y < Hgt)) { if (Dots[(y * Wid) + x] == '1') { retval = 1; } } - + return retval; } /* Dot pattern scoring routine from Annex A */ -int score_array (char Dots[], int Hgt, int Wid) { +int score_array(char Dots[], int Hgt, int Wid) { int x, y, worstedge, first, last, sum; - + sum = 0; first = -1; - + // across the top edge, count printed dots and measure their extent for (x = 0; x < Wid; x += 2) - if (get_dot(Dots,Hgt,Wid,x,0)) { + if (get_dot(Dots, Hgt, Wid, x, 0)) { if (first < 0) { first = x; } - last = x; + last = x; sum++; } - worstedge = sum + last-first; + worstedge = sum + last - first; worstedge *= Hgt; - + sum = 0; first = -1; - + //across the bottom edge, ditto - for (x = Wid & 1; x < Wid; x += 2) - if (get_dot(Dots,Hgt,Wid,x,Hgt-1)) { + for (x = Wid & 1; x < Wid; x += 2) + if (get_dot(Dots, Hgt, Wid, x, Hgt - 1)) { if (first < 0) { first = x; } - last = x; + last = x; sum++; } - sum += last-first; + sum += last - first; sum *= Hgt; if (sum < worstedge) { worstedge = sum; } - + sum = 0; first = -1; - + //down the left edge, ditto - for (y = 0; y < Hgt; y += 2) - if (get_dot(Dots,Hgt,Wid,0,y)) { + for (y = 0; y < Hgt; y += 2) + if (get_dot(Dots, Hgt, Wid, 0, y)) { if (first < 0) { first = y; } - last = y; + last = y; sum++; } - sum += last-first; + sum += last - first; sum *= Wid; if (sum < worstedge) { worstedge = sum; } - + sum = 0; first = -1; - + //down the right edge, ditto - for (y = Hgt & 1; y < Hgt; y += 2) - if (get_dot(Dots,Hgt,Wid,Wid-1,y)) { + for (y = Hgt & 1; y < Hgt; y += 2) + if (get_dot(Dots, Hgt, Wid, Wid - 1, y)) { if (first < 0) { first = y; } - last = y; + last = y; sum++; } - sum += last-first; - sum *= Wid; + sum += last - first; + sum *= Wid; if (sum < worstedge) { worstedge = sum; } @@ -156,20 +156,20 @@ int score_array (char Dots[], int Hgt, int Wid) { sum = 0; for (y = 0; y < Hgt; y++) { for (x = y & 1; x < Wid; x += 2) { - if ((!get_dot(Dots,Hgt,Wid,x-1,y-1)) - && (!get_dot(Dots,Hgt,Wid,x+1,y-1)) - && (!get_dot(Dots,Hgt,Wid,x-1,y+1)) - &&(!get_dot(Dots,Hgt,Wid,x+1,y+1)) - && ((!get_dot(Dots,Hgt,Wid,x,y)) - || ((!get_dot(Dots,Hgt,Wid,x-2,y)) - && (!get_dot(Dots,Hgt,Wid,x,y-2)) - && (!get_dot(Dots,Hgt,Wid,x+2,y)) - && (!get_dot(Dots,Hgt,Wid,x,y+2))))) { + if ((!get_dot(Dots, Hgt, Wid, x - 1, y - 1)) + && (!get_dot(Dots, Hgt, Wid, x + 1, y - 1)) + && (!get_dot(Dots, Hgt, Wid, x - 1, y + 1)) + &&(!get_dot(Dots, Hgt, Wid, x + 1, y + 1)) + && ((!get_dot(Dots, Hgt, Wid, x, y)) + || ((!get_dot(Dots, Hgt, Wid, x - 2, y)) + && (!get_dot(Dots, Hgt, Wid, x, y - 2)) + && (!get_dot(Dots, Hgt, Wid, x + 2, y)) + && (!get_dot(Dots, Hgt, Wid, x, y + 2))))) { sum++; } } } - + return (worstedge - sum * sum); } @@ -177,70 +177,73 @@ int score_array (char Dots[], int Hgt, int Wid) { // "rsencode(nd,nc)" adds "nc" R-S check words to "nd" data words in wd[] // employing Galois Field GF, where GF is prime, with a prime modulus of PM //------------------------------------------------------------------------- -void rsencode (int nd, int nc, unsigned char *wd) { + +void rsencode(int nd, int nc, unsigned char *wd) { int i, j, k, nw, start, step, root[GF], c[GF]; - + // Start by generating "nc" roots (antilogs): root[0] = 1; - for (i=1; i<=nc; i++) - root[i] = (PM * root[i-1]) % GF; - + for (i = 1; i <= nc; i++) + root[i] = (PM * root[i - 1]) % GF; + // Here we compute how many interleaved R-S blocks will be needed - nw = nd + nc; step = (nw + GF - 2)/(GF - 1); - + nw = nd + nc; + step = (nw + GF - 2) / (GF - 1); + // ...& then for each such block: - for (start=0; start=1; j--) { - c[j] = (GF + c[j] - (root[i] * c[j-1]) % GF) % GF; + for (i = 1; i <= NC; i++) + c[i] = 0; + c[0] = 1; + + for (i = 1; i <= NC; i++) { + for (j = NC; j >= 1; j--) { + c[j] = (GF + c[j] - (root[i] * c[j - 1]) % GF) % GF; } } - + // & then compute the corresponding checkword values into wd[] // ... (a) starting at wd[start] & (b) stepping by step - for (i=ND; i= 32) { retval = 1; } - switch(source[position]) { + switch (source[position]) { case 9: // HT case 28: // FS case 29: // GS @@ -254,43 +257,43 @@ int datum_b(unsigned char source[], int position, int length) { } } } - + return retval; } /* Check if the next characters are directly encodable in code set C (Annex F.II.D) */ int datum_c(unsigned char source[], int position, int length) { int retval = 0; - + if (position < length - 2) { if (((source[position] >= '0') && (source[position] <= '9')) && ((source[position + 1] >= '0') && (source[position + 1] <= '9'))) retval = 1; } - + return retval; } /* Returns how many consecutive digits lie immediately ahead (Annex F.II.A) */ int n_digits(unsigned char source[], int position, int length) { int i; - - for(i = position; ((source[i] >= '0') && (source[i] <= '9')) && (i < length); i++); - + + for (i = position; ((source[i] >= '0') && (source[i] <= '9')) && (i < length); i++); + return i - position; } /* checks ahead for 10 or more digits starting "17xxxxxx10..." (Annex F.II.B) */ int seventeen_ten(unsigned char source[], int position, int length) { int found = 0; - - if(n_digits(source, position, length) >= 10) { - if(((source[position] == '1') && (source[position + 1] == '7')) + + if (n_digits(source, position, length) >= 10) { + if (((source[position] == '1') && (source[position + 1] == '7')) && ((source[position + 8] == '1') && (source[position + 9] == '0'))) { found = 1; } } - + return found; } @@ -299,59 +302,59 @@ int seventeen_ten(unsigned char source[], int position, int length) { */ int ahead_c(unsigned char source[], int position, int length) { int count = 0; - - for(int i = position; (i < length) && datum_c(source, i, length); i+= 2) { + + for (int i = position; (i < length) && datum_c(source, i, length); i += 2) { count++; } - + return count; } /* Annex F.II.F */ int try_c(unsigned char source[], int position, int length) { int retval = 0; - - if(n_digits(source, position, length) > 0) { - if(ahead_c(source, position, length) > ahead_c(source, position + 1, length)) { + + if (n_digits(source, position, length) > 0) { + if (ahead_c(source, position, length) > ahead_c(source, position + 1, length)) { retval = ahead_c(source, position, length); } } - + return retval; } /* Annex F.II.G */ int ahead_a(unsigned char source[], int position, int length) { int count = 0; - - for(int i = position; ((i < length) && datum_a(source, i, length)) + + for (int i = position; ((i < length) && datum_a(source, i, length)) && (try_c(source, i, length) < 2); i++) { count++; } - + return count; } /* Annex F.II.H */ int ahead_b(unsigned char source[], int position, int length) { int count = 0; - - for(int i = position; ((i < length) && datum_b(source, i, length)) + + for (int i = position; ((i < length) && datum_b(source, i, length)) && (try_c(source, i, length) < 2); i++) { count++; } - + return count; } /* checks if the next character is in the range 128 to 255 (Annex F.II.I) */ int binary(unsigned char source[], int position, int length) { int retval = 0; - - if(source[position] >= 128) { + + if (source[position] >= 128) { retval = 1; } - + return retval; } @@ -363,59 +366,63 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i int debug = 0; int binary_buffer_size = 0; int lawrencium[6]; // Reversed radix 103 values - + #if defined(_MSC_VER) && _MSC_VER == 1200 uint64_t binary_buffer = 0; #else uint64_t binary_buffer = 0ULL; #endif - + input_position = 0; array_length = 0; encoding_mode = 'C'; inside_macro = 0; - + if (symbol->output_options & READER_INIT) { codeword_array[array_length] = 109; // FNC3 array_length++; } - + if (symbol->input_mode != GS1_MODE) { codeword_array[array_length] = 107; // FNC1 array_length++; } - + do { done = 0; - + /* Step A */ if ((input_position == length - 2) && (inside_macro != 0) && (inside_macro != 100)) { // inside_macro only gets set to 97, 98 or 99 if the last two characters are RS/EOT input_position += 2; done = 1; - if (debug) { printf("A "); } + if (debug) { + printf("A "); + } } - + if ((input_position == length - 1) && (inside_macro == 100)) { // inside_macro only gets set to 100 if the last character is EOT input_position++; done = 1; - if (debug) { printf("A "); } + if (debug) { + printf("A "); + } } - + /* Step B1 */ if ((!done) && (encoding_mode == 'C')) { if ((array_length == 0) && (length > 9)) { - if((source[input_position] == '[') + if ((source[input_position] == '[') && (source[input_position + 1] == ')') && (source[input_position + 2] == '>') && (source[input_position + 3] == 30) // RS - && (source[length - 1] == 04)) { // EOT - + && (source[length - 1] == 04)) { // EOT + codeword_array[array_length] = 106; // Latch B array_length++; encoding_mode = 'B'; - + if ((source[input_position + 6] == 29) && (source[length - 2] == 30)) { // GS/RS if ((source[input_position + 4] == '0') && (source[input_position + 5] == '5')) { codeword_array[array_length] = 97; // Macro @@ -423,7 +430,9 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i input_position += 7; inside_macro = 97; done = 1; - if (debug) { printf("B1/1 "); } + if (debug) { + printf("B1/1 "); + } } if ((source[input_position + 4] == '0') && (source[input_position + 5] == '6')) { @@ -432,7 +441,9 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i input_position += 7; inside_macro = 98; done = 1; - if (debug) { printf("B1/2 "); } + if (debug) { + printf("B1/2 "); + } } if ((source[input_position + 4] == '1') && (source[input_position + 5] == '2')) { @@ -441,22 +452,26 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i input_position += 7; inside_macro = 99; done = 1; - if (debug) { printf("B1/3 "); } + if (debug) { + printf("B1/3 "); + } } } - + if (!done) { codeword_array[array_length] = 100; // Macro array_length++; input_position += 4; inside_macro = 100; done = 1; - if (debug) { printf("B1/4 "); } + if (debug) { + printf("B1/4 "); + } } } } } - + /* Step B2 */ if ((!done) && (encoding_mode == 'C')) { if (seventeen_ten(source, input_position, length)) { @@ -470,13 +485,15 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i array_length++; input_position += 10; done = 1; - if (debug) { printf("B2/1 "); } + if (debug) { + printf("B2/1 "); + } } } - + if ((!done) && (encoding_mode == 'C')) { if (datum_c(source, input_position, length) || ((source[input_position] == '[') && (symbol->input_mode == GS1_MODE))) { - if (source[input_position] == '[') { + if (source[input_position] == '[') { codeword_array[array_length] = 107; // FNC1 input_position++; } else { @@ -485,15 +502,17 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i } array_length++; done = 1; - if (debug) { printf("B2/2 "); } + if (debug) { + printf("B2/2 "); + } } } - + /* Setp B3 */ if ((!done) && (encoding_mode == 'C')) { if (binary(source, input_position, length)) { if (n_digits(source, input_position + 1, length) > 0) { - if ((source[input_position] - 128) < 32) { + if ((source[input_position] - 128) < 32) { codeword_array[array_length] = 110; // Bin Shift A array_length++; codeword_array[array_length] = source[input_position] - 128 + 64; @@ -509,12 +528,14 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i codeword_array[array_length] = 112; // Bin Latch array_length++; encoding_mode = 'X'; - } + } done = 1; - if (debug) { printf("B3 "); } + if (debug) { + printf("B3 "); + } } } - + /* Step B4 */ if ((!done) && (encoding_mode == 'C')) { int m = ahead_a(source, input_position, length); @@ -527,8 +548,8 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i if (n <= 4) { codeword_array[array_length] = 101 + n; // nx Shift B array_length++; - - for(i = 0; i < n; i++) { + + for (i = 0; i < n; i++) { codeword_array[array_length] = source[input_position] - 32; array_length++; input_position++; @@ -540,18 +561,20 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i } } done = 1; - if (debug) { printf("B4 "); } + if (debug) { + printf("B4 "); + } } - + /* Step C1 */ if ((!done) && (encoding_mode == 'B')) { int n = try_c(source, input_position, length); - + if (n >= 2) { if (n <= 4) { codeword_array[array_length] = 103 + (n - 2); // nx Shift C array_length++; - for(i = 0; i < n; i++) { + for (i = 0; i < n; i++) { codeword_array[array_length] = ((source[input_position] - '0') * 10) + (source[input_position + 1] - '0'); array_length++; input_position += 2; @@ -562,10 +585,12 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i encoding_mode = 'C'; } done = 1; - if (debug) { printf("C1 "); } + if (debug) { + printf("C1 "); + } } } - + /* Step C2 */ if ((!done) && (encoding_mode == 'B')) { if ((source[input_position] == '[') && (symbol->input_mode == GS1_MODE)) { @@ -573,23 +598,27 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i array_length++; input_position++; done = 1; - if (debug) { printf("C2/1 "); } + if (debug) { + printf("C2/1 "); + } } else { if (datum_b(source, input_position, length)) { codeword_array[array_length] = source[input_position] - 32; array_length++; input_position++; done = 1; - if (debug) { printf("C2/2 "); } + if (debug) { + printf("C2/2 "); + } } } } - + /* Step C3 */ if ((!done) && (encoding_mode == 'B')) { if (binary(source, input_position, length)) { if (datum_b(source, input_position + 1, length)) { - if ((source[input_position] - 128) < 32) { + if ((source[input_position] - 128) < 32) { codeword_array[array_length] = 110; // Bin Shift A array_length++; codeword_array[array_length] = source[input_position] - 128 + 64; @@ -607,10 +636,12 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i encoding_mode = 'X'; } done = 1; - if (debug) { printf("C3 "); } + if (debug) { + printf("C3 "); + } } } - + /* Step C4 */ if ((!done) && (encoding_mode == 'B')) { if (ahead_a(source, input_position, length) == 1) { @@ -629,9 +660,11 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i encoding_mode = 'A'; } done = 1; - if (debug) { printf("C4 "); } + if (debug) { + printf("C4 "); + } } - + /* Step D1 */ if ((!done) && (encoding_mode == 'A')) { int n = try_c(source, input_position, length); @@ -639,7 +672,7 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i if (n <= 4) { codeword_array[array_length] = 103 + (n - 2); // nx Shift C array_length++; - for(i = 0; i < n; i++) { + for (i = 0; i < n; i++) { codeword_array[array_length] = ((source[input_position] - '0') * 10) + (source[input_position + 1] - '0'); array_length++; input_position += 2; @@ -650,10 +683,12 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i encoding_mode = 'C'; } done = 1; - if (debug) { printf("D1 "); } + if (debug) { + printf("D1 "); + } } } - + /* Step D2 */ if ((!done) && (encoding_mode == 'A')) { if ((source[input_position] == '[') && (symbol->input_mode == GS1_MODE)) { @@ -661,27 +696,31 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i array_length++; input_position++; done = 1; - if (debug) { printf("D2/1 "); } + if (debug) { + printf("D2/1 "); + } } else { if (datum_a(source, input_position, length)) { if (source[input_position] < 32) { - codeword_array[array_length] = source[input_position] +64; + codeword_array[array_length] = source[input_position] + 64; } else { codeword_array[array_length] = source[input_position] - 32; } array_length++; input_position++; done = 1; - if (debug) { printf("D2/2 "); } + if (debug) { + printf("D2/2 "); + } } } } - + /* Step D3 */ if ((!done) && (encoding_mode == 'A')) { if (binary(source, input_position, length)) { if (datum_a(source, input_position + 1, length)) { - if ((source[input_position] - 128) < 32) { + if ((source[input_position] - 128) < 32) { codeword_array[array_length] = 110; // Bin Shift A array_length++; codeword_array[array_length] = source[input_position] - 128 + 64; @@ -699,18 +738,20 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i encoding_mode = 'X'; } done = 1; - if (debug) { printf("D3 "); } + if (debug) { + printf("D3 "); + } } } - + /* Step D4 */ if ((!done) && (encoding_mode == 'A')) { int n = ahead_b(source, input_position, length); - + if (n <= 6) { codeword_array[array_length] = 95 + n; // nx Shift B array_length++; - for(i = 0; i < n; i++) { + for (i = 0; i < n; i++) { codeword_array[array_length] = source[input_position] - 32; array_length++; input_position++; @@ -721,31 +762,33 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i encoding_mode = 'B'; } done = 1; - if (debug) { printf("D4 "); } + if (debug) { + printf("D4 "); + } } - + /* Step E1 */ if ((!done) && (encoding_mode == 'X')) { int n = try_c(source, input_position, length); - + if (n >= 2) { /* Empty binary buffer */ - for(i = 0; i < (binary_buffer_size + 1); i++) { + for (i = 0; i < (binary_buffer_size + 1); i++) { lawrencium[i] = binary_buffer % 103; binary_buffer /= 103; } - for(i = 0; i < (binary_buffer_size + 1); i++) { + for (i = 0; i < (binary_buffer_size + 1); i++) { codeword_array[array_length] = lawrencium[binary_buffer_size - i]; array_length++; } binary_buffer = 0; binary_buffer_size = 0; - + if (n <= 7) { codeword_array[array_length] = 101 + n; // Interrupt for nx Shift C array_length++; - for(i = 0; i < n; i++) { + for (i = 0; i < n; i++) { codeword_array[array_length] = ((source[input_position] - '0') * 10) + (source[input_position + 1] - '0'); array_length++; input_position += 2; @@ -756,31 +799,33 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i encoding_mode = 'C'; } done = 1; - if (debug) { printf("E1 "); } + if (debug) { + printf("E1 "); + } } } - + /* Step E2 */ /* Section 5.2.1.1 para D.2.i states: * "Groups of six codewords, each valued between 0 and 102, are radix converted from * base 103 into five base 259 values..." */ if ((!done) && (encoding_mode == 'X')) { - if(binary(source, input_position, length) + if (binary(source, input_position, length) || binary(source, input_position + 1, length) || binary(source, input_position + 2, length) || binary(source, input_position + 3, length)) { binary_buffer *= 259; binary_buffer += source[input_position]; binary_buffer_size++; - + if (binary_buffer_size == 5) { - for(i = 0; i < 6; i++) { + for (i = 0; i < 6; i++) { lawrencium[i] = binary_buffer % 103; binary_buffer /= 103; } - - for(i = 0; i < 6; i++) { + + for (i = 0; i < 6; i++) { codeword_array[array_length] = lawrencium[5 - i]; array_length++; } @@ -789,25 +834,27 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i } input_position++; done = 1; - if (debug) { printf("E2 "); } + if (debug) { + printf("E2 "); + } } } - + /* Step E3 */ if ((!done) && (encoding_mode == 'X')) { /* Empty binary buffer */ - for(i = 0; i < (binary_buffer_size + 1); i++) { + for (i = 0; i < (binary_buffer_size + 1); i++) { lawrencium[i] = binary_buffer % 103; binary_buffer /= 103; } - for(i = 0; i < (binary_buffer_size + 1); i++) { + for (i = 0; i < (binary_buffer_size + 1); i++) { codeword_array[array_length] = lawrencium[binary_buffer_size - i]; array_length++; } binary_buffer = 0; binary_buffer_size = 0; - + if (ahead_a(source, input_position, length) > ahead_b(source, input_position, length)) { codeword_array[array_length] = 109; // Terminate with Latch to A encoding_mode = 'A'; @@ -817,12 +864,16 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i } array_length++; done = 1; - if (debug) { printf("E3 "); } + if (debug) { + printf("E3 "); + } } } while (input_position < length); - - if (debug) { printf("\n\n"); } - + + if (debug) { + printf("\n\n"); + } + return array_length; } @@ -830,11 +881,11 @@ int dotcode_encode_message(struct zint_symbol *symbol, unsigned char source[], i int make_dotstream(unsigned char masked_array[], int array_length, char dot_stream[]) { int i, j; int mask = 0x100; - + dot_stream[0] = '\0'; - + /* Mask value is encoded as two dots */ - switch(masked_array[0]) { + switch (masked_array[0]) { case 0: strcat(dot_stream, "00"); break; @@ -848,10 +899,10 @@ int make_dotstream(unsigned char masked_array[], int array_length, char dot_stre strcat(dot_stream, "11"); break; } - + /* The rest of the data uses 9-bit dot patterns from Annex C */ for (i = 1; i < array_length; i++) { - for(j = 0; j < 9; j++) { + for (j = 0; j < 9; j++) { if (dot_patterns[masked_array[i]] & (mask >> j)) { strcat(dot_stream, "1"); } else { @@ -859,20 +910,21 @@ int make_dotstream(unsigned char masked_array[], int array_length, char dot_stre } } } - + return strlen(dot_stream); } /* Determines if a given dot is a reserved corner dot - * to be used by one of the last six bits */ + * to be used by one of the last six bits + */ int is_corner(int column, int row, int width, int height) { int corner = 0; - + /* Top Left */ if ((column == 0) && (row == 0)) { corner = 1; - } - + } + /* Top Right */ if (height % 2) { if (((column == width - 2) && (row == 0)) @@ -884,7 +936,7 @@ int is_corner(int column, int row, int width, int height) { corner = 1; } } - + /* Bottom Left */ if (height % 2) { if ((column == 0) && (row == height - 1)) { @@ -896,13 +948,13 @@ int is_corner(int column, int row, int width, int height) { corner = 1; } } - + /* Bottom Right */ if (((column == width - 2) && (row == height - 1)) || ((column == width - 1) && (row == height - 2))) { corner = 1; } - + return corner; } @@ -910,7 +962,7 @@ int is_corner(int column, int row, int width, int height) { void fold_dotstream(char dot_stream[], int width, int height, char dot_array[]) { int column, row; int input_position = 0; - + if (height % 2) { /* Horizontal folding */ for (row = 0; row < height; row++) { @@ -927,7 +979,7 @@ void fold_dotstream(char dot_stream[], int width, int height, char dot_array[]) } } } - + /* Corners */ dot_array[width - 2] = dot_stream[input_position]; input_position++; @@ -956,7 +1008,7 @@ void fold_dotstream(char dot_stream[], int width, int height, char dot_array[]) } } } - + /* Corners */ dot_array[((height - 1) * width) - 1] = dot_stream[input_position]; input_position++; @@ -982,50 +1034,60 @@ int dotcode(struct zint_symbol *symbol, unsigned char source[], int length) { int dot_stream_length; int high_score, best_mask; int debug = 0; - + #ifndef _MSC_VER unsigned char codeword_array[length * 3]; unsigned char masked_codeword_array[length * 3]; #else - unsigned char* codeword_array = (unsigned char *) _alloca(length * 3 * sizeof(unsigned char)); - unsigned char* masked_codeword_array = (unsigned char *) _alloca(length * 3 * sizeof(unsigned char)); + unsigned char* codeword_array = (unsigned char *) _alloca(length * 3 * sizeof (unsigned char)); + unsigned char* masked_codeword_array = (unsigned char *) _alloca(length * 3 * sizeof (unsigned char)); #endif /* _MSC_VER */ - + data_length = dotcode_encode_message(symbol, source, length, codeword_array); - + ecc_length = 3 + (data_length / 2); - + if (debug) { printf("Codeword length = %d, ECC length = %d\n", data_length, ecc_length); } - + min_dots = 9 * (data_length + 3 + (data_length / 2)) + 2; - - //FIXME: Listen to user preferences here - height = sqrt(2 * min_dots); - if ((height % 2) == 1) { - height++; + + if (symbol->option_2 == 0) { + + height = sqrt(2 * min_dots); + if (height % 2) { + height++; + } + + width = (2 * min_dots) / height; + if (!(width % 2)) { + width++; + } + + } else { + width = symbol->option_2; + + height = min_dots / width; + + if (!((width + height) % 2)) { + height++; + } } - - width = (2 * min_dots) / height; - - if ((width % 2) != 1) { - width++; - } - + n_dots = (height * width) / 2; - + #ifndef _MSC_VER char dot_stream[n_dots + 3]; char dot_array[width * height]; #else - char* dot_stream = (char *) _alloca((n_dots + 3) * sizeof(char)); - char* dot_array = (char *) _alloca(width * height * sizeof(char)); + char* dot_stream = (char *) _alloca((n_dots + 3) * sizeof (char)); + char* dot_array = (char *) _alloca(width * height * sizeof (char)); #endif /* _MSC_VER */ - + /* Add pad characters */ - for(pad_chars = 0; 9 * ((data_length + pad_chars + 3 + ((data_length + pad_chars) / 2)) + 2) < n_dots; pad_chars++); - + for (pad_chars = 0; 9 * ((data_length + pad_chars + 3 + ((data_length + pad_chars) / 2)) + 2) < n_dots; pad_chars++); + if (pad_chars > 0) { codeword_array[data_length] = 109; // Latch to Code Set A data_length++; @@ -1036,22 +1098,22 @@ int dotcode(struct zint_symbol *symbol, unsigned char source[], int length) { codeword_array[data_length] = 106; // Pad data_length++; } - + ecc_length = 3 + (data_length / 2); - + /* Evaluate data mask options */ for (i = 0; i < 4; i++) { - switch(i) { + switch (i) { case 0: masked_codeword_array[0] = 0; - for(j = 0; j < data_length; j++) { + for (j = 0; j < data_length; j++) { masked_codeword_array[j + 1] = codeword_array[j]; } break; case 1: weight = 0; masked_codeword_array[0] = 1; - for(j = 0; j < data_length; j++) { + for (j = 0; j < data_length; j++) { masked_codeword_array[j + 1] = (weight + codeword_array[j]) % 113; weight += 3; } @@ -1059,7 +1121,7 @@ int dotcode(struct zint_symbol *symbol, unsigned char source[], int length) { case 2: weight = 0; masked_codeword_array[0] = 2; - for(j = 0; j < data_length; j++) { + for (j = 0; j < data_length; j++) { masked_codeword_array[j + 1] = (weight + codeword_array[j]) % 113; weight += 7; } @@ -1067,54 +1129,54 @@ int dotcode(struct zint_symbol *symbol, unsigned char source[], int length) { case 3: weight = 0; masked_codeword_array[0] = 3; - for(j = 0; j < data_length; j++) { + for (j = 0; j < data_length; j++) { masked_codeword_array[j + 1] = (weight + codeword_array[j]) % 113; weight += 17; } break; } - + rsencode(data_length + 1, ecc_length, masked_codeword_array); - + dot_stream_length = make_dotstream(masked_codeword_array, (data_length + ecc_length + 1), dot_stream); - + /* Add pad bits */ - for(j = dot_stream_length; j < n_dots; j++) { + for (j = dot_stream_length; j < n_dots; j++) { strcat(dot_stream, "1"); } - + fold_dotstream(dot_stream, width, height, dot_array); - + mask_score[i] = score_array(dot_array, height, width); - + if (debug) { printf("Mask %d score is %d\n", i, mask_score[i]); } } - + high_score = mask_score[0]; best_mask = 0; - - for(i = 1; i < 4; i++) { + + for (i = 1; i < 4; i++) { if (mask_score[i] > high_score) { high_score = mask_score[i]; best_mask = i; } } - + if (best_mask != 3) { /* Reprocess to get symbol with best mask */ - switch(best_mask) { + switch (best_mask) { case 0: masked_codeword_array[0] = 0; - for(j = 0; j < data_length; j++) { + for (j = 0; j < data_length; j++) { masked_codeword_array[j + 1] = codeword_array[j]; } break; case 1: weight = 0; masked_codeword_array[0] = 1; - for(j = 0; j < data_length; j++) { + for (j = 0; j < data_length; j++) { masked_codeword_array[j + 1] = (weight + codeword_array[j]) % 113; weight += 3; } @@ -1122,33 +1184,33 @@ int dotcode(struct zint_symbol *symbol, unsigned char source[], int length) { case 2: weight = 0; masked_codeword_array[0] = 2; - for(j = 0; j < data_length; j++) { + for (j = 0; j < data_length; j++) { masked_codeword_array[j + 1] = (weight + codeword_array[j]) % 113; weight += 7; } break; } - + rsencode(data_length + 1, ecc_length, masked_codeword_array); dot_stream_length = make_dotstream(masked_codeword_array, (data_length + ecc_length + 1), dot_stream); - + /* Add pad bits */ - for(j = dot_stream_length; j < n_dots; j++) { + for (j = dot_stream_length; j < n_dots; j++) { strcat(dot_stream, "1"); } - + fold_dotstream(dot_stream, width, height, dot_array); } /* else { the version with the best mask is already in memory } */ - + if (debug) { - for(k = 0; k < height; k++) { + for (k = 0; k < height; k++) { for (j = 0; j < width; j++) { printf("%c", dot_array[(k * width) + j]); } printf("\n"); } } - + /* Copy values to symbol */ symbol->width = width; symbol->rows = height; @@ -1161,6 +1223,8 @@ int dotcode(struct zint_symbol *symbol, unsigned char source[], int length) { } symbol->row_height[k] = 1; } - + + symbol->barcode_options += BARCODE_DOTTY_MODE; + return 0; } \ No newline at end of file