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

Patch by Milton Neal: Do not double forelast character, if it does not fit in a C40 encoding and the last character is shifted (reported by Bertram Wirth)

Browse Source
This commit is contained in:
Harald Oehlmann 2015-08-18 14:30:09 +02:00
parent 32ac8ccbae
commit 66f112098d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/dmatrix.c
View File

@ -524,7 +524,9 @@ int dm200encode(struct zint_symbol *symbol, unsigned char source[], unsigned cha
value = 27; /* FNC1 */ value = 27; /* FNC1 */
} }
if(shift_set != 0) { /* Do not output the shift if we are at the end and
thus, the character is outputted using ASCII */
if(shift_set != 0 && inputlen - sp > 1) {
c40_buffer[c40_p] = shift_set - 1; c40_p++; c40_buffer[c40_p] = shift_set - 1; c40_p++;
} }
c40_buffer[c40_p] = value; c40_p++; c40_buffer[c40_p] = value; c40_p++;
@ -720,7 +722,8 @@ int dm200encode(struct zint_symbol *symbol, unsigned char source[], unsigned cha
current_mode = DM_ASCII; current_mode = DM_ASCII;
} }
if(c40_p == 1) { if(c40_p == 1) {
// don't unlatch before sending a single remaining ASCII character. // ToDo: If we know that there is no Pad after this, the unlatch may be removed
target[tp] = 254; tp++; /* unlatch */
target[tp] = source[inputlen - 1] + 1; tp++; target[tp] = source[inputlen - 1] + 1; tp++;
concat(binary, " "); concat(binary, " ");
if(debug) printf("ASC A%02X ", target[tp - 1] - 1); if(debug) printf("ASC A%02X ", target[tp - 1] - 1);