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

Same functionality but IMHO nicer because special handling only at one place

Browse Source
This commit is contained in:
Harald Oehlmann 2015-08-18 14:38:11 +02:00
parent 66f112098d
commit bf687fc409
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backend/dmatrix.c
View File

@ -524,9 +524,7 @@ int dm200encode(struct zint_symbol *symbol, unsigned char source[], unsigned cha
value = 27; /* FNC1 */ value = 27; /* FNC1 */
} }
/* Do not output the shift if we are at the end and if(shift_set != 0) {
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++;
@ -713,7 +711,18 @@ int dm200encode(struct zint_symbol *symbol, unsigned char source[], unsigned cha
} /* while */ } /* while */
/* Empty buffers */ /* Empty buffers */
if(c40_p == 2) { if(c40_p == 1 || ( c40_p == 2 && c40_buffer[0] < 3 ) ) {
/* There is one C40 character, wether with shift or without -> output
one ASCII
* character */
/* ToDo: If it is known that the symbol is not filled, the unlatch
might be omitted*/
target[tp] = 254; tp++; /* unlatch */
target[tp] = source[inputlen - 1] + 1; tp++;
concat(binary, " ");
if(debug) printf("ASC A%02X ", target[tp - 1] - 1);
current_mode = DM_ASCII;
} else if(c40_p == 2) {
target[tp] = 254; tp++; /* unlatch */ target[tp] = 254; tp++; /* unlatch */
target[tp] = source[inputlen - 2] + 1; tp++; target[tp] = source[inputlen - 2] + 1; tp++;
target[tp] = source[inputlen - 1] + 1; tp++; target[tp] = source[inputlen - 1] + 1; tp++;
@ -721,14 +730,6 @@ int dm200encode(struct zint_symbol *symbol, unsigned char source[], unsigned cha
if(debug) printf("ASC A%02X A%02X ", target[tp - 2] - 1, target[tp - 1] - 1); if(debug) printf("ASC A%02X A%02X ", target[tp - 2] - 1, target[tp - 1] - 1);
current_mode = DM_ASCII; current_mode = DM_ASCII;
} }
if(c40_p == 1) {
// 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++;
concat(binary, " ");
if(debug) printf("ASC A%02X ", target[tp - 1] - 1);
current_mode = DM_ASCII;
}
if(text_p == 2) { if(text_p == 2) {
target[tp] = 254; tp++; /* unlatch */ target[tp] = 254; tp++; /* unlatch */