mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert last commit, and use more standard compliant solution

Browse Source
This commit is contained in:
Robin Stuart 2016-11-19 10:16:10 +00:00
parent 1d4cead56e
commit 4ea35b9082
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
backend/dmatrix.c
View File

@ -694,26 +694,24 @@ static int dm200encode(struct zint_symbol *symbol, const unsigned char source[],
next_mode = DM_ASCII; next_mode = DM_ASCII;
if (debug) printf("ASC "); if (debug) printf("ASC ");
} else { } else {
/* Note process_buffer uses special values 41 - 43 to distinguish
Shift 1, Shift 2 and Shift 3 from characters [/0/x01/x02!"#'ab] */
if (source[sp] > 127) { if (source[sp] > 127) {
process_buffer[*process_p] = 1; process_buffer[*process_p] = 1;
(*process_p)++; (*process_p)++;
process_buffer[*process_p] = 30; process_buffer[*process_p] = 30;
(*process_p)++; /* Upper Shift */ (*process_p)++; /* Upper Shift */
shift_set = 40 + c40_shift[source[sp] - 128]; shift_set = c40_shift[source[sp] - 128];
value = c40_value[source[sp] - 128]; value = c40_value[source[sp] - 128];
} else { } else {
shift_set = 40 + c40_shift[source[sp]]; shift_set = c40_shift[source[sp]];
value = c40_value[source[sp]]; value = c40_value[source[sp]];
} }
if (gs1 && (source[sp] == '[')) { if (gs1 && (source[sp] == '[')) {
shift_set = 42; shift_set = 2;
value = 27; /* FNC1 */ value = 27; /* FNC1 */
} }
if (shift_set != 40) { if (shift_set != 0) {
process_buffer[*process_p] = shift_set - 1; process_buffer[*process_p] = shift_set - 1;
(*process_p)++; (*process_p)++;
} }
@ -723,7 +721,7 @@ static int dm200encode(struct zint_symbol *symbol, const unsigned char source[],
if (*process_p >= 3) { if (*process_p >= 3) {
int iv; int iv;
iv = (1600 * (process_buffer[0] % 40)) + (40 * (process_buffer[1] % 40)) + (process_buffer[2] % 40) + 1; iv = (1600 * process_buffer[0]) + (40 * process_buffer[1]) + (process_buffer[2]) + 1;
target[tp] = (unsigned char) (iv / 256); target[tp] = (unsigned char) (iv / 256);
tp++; tp++;
target[tp] = iv % 256; target[tp] = iv % 256;
@ -759,26 +757,24 @@ static int dm200encode(struct zint_symbol *symbol, const unsigned char source[],
next_mode = DM_ASCII; next_mode = DM_ASCII;
if (debug) printf("ASC "); if (debug) printf("ASC ");
} else { } else {
/* Note process_buffer uses special values 41 - 43 to distinguish
Shift 1, Shift 2 and Shift 3 from characters [/0/x01/x02!"#'AB] */
if (source[sp] > 127) { if (source[sp] > 127) {
process_buffer[*process_p] = 1; process_buffer[*process_p] = 1;
(*process_p)++; (*process_p)++;
process_buffer[*process_p] = 30; process_buffer[*process_p] = 30;
(*process_p)++; /* Upper Shift */ (*process_p)++; /* Upper Shift */
shift_set = 40 + text_shift[source[sp] - 128]; shift_set = text_shift[source[sp] - 128];
value = text_value[source[sp] - 128]; value = text_value[source[sp] - 128];
} else { } else {
shift_set = 40 + text_shift[source[sp]]; shift_set = text_shift[source[sp]];
value = text_value[source[sp]]; value = text_value[source[sp]];
} }
if (gs1 && (source[sp] == '[')) { if (gs1 && (source[sp] == '[')) {
shift_set = 42; shift_set = 2;
value = 27; /* FNC1 */ value = 27; /* FNC1 */
} }
if (shift_set != 40) { if (shift_set != 0) {
process_buffer[*process_p] = shift_set - 1; process_buffer[*process_p] = shift_set - 1;
(*process_p)++; (*process_p)++;
} }
@ -788,7 +784,7 @@ static int dm200encode(struct zint_symbol *symbol, const unsigned char source[],
if (*process_p >= 3) { if (*process_p >= 3) {
int iv; int iv;
iv = (1600 * (process_buffer[0] % 40)) + (40 * (process_buffer[1] % 40)) + (process_buffer[2] % 40) + 1; iv = (1600 * process_buffer[0]) + (40 * process_buffer[1]) + (process_buffer[2]) + 1;
target[tp] = (unsigned char) (iv / 256); target[tp] = (unsigned char) (iv / 256);
tp++; tp++;
target[tp] = iv % 256; target[tp] = iv % 256;
@ -1002,7 +998,7 @@ static int dm200encode_remainder(unsigned char target[], int target_length, cons
if (process_p == 2) // 2 data characters left to encode. if (process_p == 2) // 2 data characters left to encode.
{ {
// Pad with shift 1 value (0) and encode as double. // Pad with shift 1 value (0) and encode as double.
int intValue = (1600 * (process_buffer[0] % 40)) + (40 * (process_buffer[1] % 40)) + 1; // ie (0 + 1). int intValue = (1600 * process_buffer[0]) + (40 * process_buffer[1]) + 1; // ie (0 + 1).
target[target_length] = (unsigned char) (intValue / 256); target[target_length] = (unsigned char) (intValue / 256);
target_length++; target_length++;
target[target_length] = (unsigned char) (intValue % 256); target[target_length] = (unsigned char) (intValue % 256);
@ -1013,8 +1009,7 @@ static int dm200encode_remainder(unsigned char target[], int target_length, cons
if (symbols_left > process_p) { if (symbols_left > process_p) {
target[target_length] = (254); target[target_length] = (254);
target_length++; // Unlatch and encode remaining data in ascii. target_length++; // Unlatch and encode remaining data in ascii.
if (process_p == 1 || (process_p == 2 && process_buffer[0] > 40)) // Check for a shift value. if (process_p == 1) {
{
target[target_length] = source[inputlen - 1] + 1; target[target_length] = source[inputlen - 1] + 1;
target_length++; target_length++;
} else if (process_p == 2) { } else if (process_p == 2) {