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

Bugfix: EDIFACT unlatch character not needed for all symbols

Browse Source 
Ref: ISO 16022 para 5.2.8.2
Bug reported by Daniel Yang
This commit is contained in:
Robin Stuart 2016-07-22 16:42:39 +01:00
parent 8f7cc8d8b1
commit c35378acc5
1 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
backend/dmatrix.c
View File

@ -527,7 +527,7 @@ static int dm200encode(struct zint_symbol *symbol, const unsigned char source[],
int sp, tp, i, gs1; int sp, tp, i, gs1;
int current_mode, next_mode; int current_mode, next_mode;
int inputlen = *length_p; int inputlen = *length_p;
int debug = 0; int debug = 1;
#ifndef _MSC_VER #ifndef _MSC_VER
char binary[2 * inputlen]; char binary[2 * inputlen];
#else #else
@ -970,7 +970,7 @@ static int dm200encode(struct zint_symbol *symbol, const unsigned char source[],
} }
static int dm200encode_remainder(unsigned char target[], int target_length, const unsigned char source[], const int inputlen, const int last_mode, const int process_buffer[], const int process_p, const int symbols_left) { static int dm200encode_remainder(unsigned char target[], int target_length, const unsigned char source[], const int inputlen, const int last_mode, const int process_buffer[], const int process_p, const int symbols_left) {
int debug = 0; int debug = 1;
switch (last_mode) { switch (last_mode) {
case DM_C40: case DM_C40:
@ -1047,7 +1047,7 @@ static int dm200encode_remainder(unsigned char target[], int target_length, cons
break; break;
case DM_EDIFACT: case DM_EDIFACT:
if (symbols_left == process_p) // Unlatch not required! if (symbols_left <= 2) // Unlatch not required!
{ {
if (process_p == 1) { if (process_p == 1) {
target[target_length] = source[inputlen - 1] + 1; target[target_length] = source[inputlen - 1] + 1;
@ -1060,9 +1060,28 @@ static int dm200encode_remainder(unsigned char target[], int target_length, cons
target[target_length] = source[inputlen - 1] + 1; target[target_length] = source[inputlen - 1] + 1;
target_length++; target_length++;
} }
} else {
// Append edifact unlatch value (31) and encode as triple.
if (process_p == 3) // Append edifact unlatch value (31) and encode as triple. if (process_p == 1) {
{ target[target_length] = (unsigned char) ((process_buffer[0] << 2) + ((31 & 0x30) >> 4));
target_length++;
target[target_length] = (unsigned char) ((31 & 0x0f) << 4) ;
target_length++;
target[target_length] = (unsigned char) 0;
target_length++;
}
if (process_p == 2) {
target[target_length] = (unsigned char) ((process_buffer[0] << 2) + ((process_buffer[1] & 0x30) >> 4));
target_length++;
target[target_length] = (unsigned char) (((process_buffer[1] & 0x0f) << 4) + ((31 & 0x3c) >> 2));
target_length++;
target[target_length] = (unsigned char) (((31 & 0x03) << 6));
target_length++;
}
if (process_p == 3) {
target[target_length] = (unsigned char) ((process_buffer[0] << 2) + ((process_buffer[1] & 0x30) >> 4)); target[target_length] = (unsigned char) ((process_buffer[0] << 2) + ((process_buffer[1] & 0x30) >> 4));
target_length++; target_length++;
target[target_length] = (unsigned char) (((process_buffer[1] & 0x0f) << 4) + ((process_buffer[2] & 0x3c) >> 2)); target[target_length] = (unsigned char) (((process_buffer[1] & 0x0f) << 4) + ((process_buffer[2] & 0x3c) >> 2));
@ -1070,38 +1089,7 @@ static int dm200encode_remainder(unsigned char target[], int target_length, cons
target[target_length] = (unsigned char) (((process_buffer[2] & 0x03) << 6) + 31); target[target_length] = (unsigned char) (((process_buffer[2] & 0x03) << 6) + 31);
target_length++; target_length++;
} }
}
if (symbols_left > process_p) // Unlatch and encode remaining data in ascii.
{
// Edifact unlatch.
if (symbols_left < 3) {
target[target_length] = 31;
target_length++;
} else
target[target_length] = (31 << 2);
target_length++;
if (process_p == 1) {
target[target_length] = source[inputlen - 1] + 1;
target_length++;
}
if (process_p == 2) {
target[target_length] = source[inputlen - 2] + 1;
target_length++;
target[target_length] = source[inputlen - 1] + 1;
target_length++;
}
if (process_p == 3) {
target[target_length] = source[inputlen - 3] + 1;
target_length++;
target[target_length] = source[inputlen - 2] + 1;
target_length++;
target[target_length] = source[inputlen - 1] + 1;
target_length++;
}
} }
break; break;
} }
@ -1222,7 +1210,7 @@ int data_matrix_200(struct zint_symbol *symbol, unsigned char source[], const in
} }
ecc200(binary, bytes, datablock, rsblock, skew); ecc200(binary, bytes, datablock, rsblock, skew);
// Print Codewords // Print Codewords
#ifdef DEBUG //#ifdef DEBUG
{ {
int CWCount; int CWCount;
if (skew) if (skew)
@ -1234,7 +1222,7 @@ int data_matrix_200(struct zint_symbol *symbol, unsigned char source[], const in
printf(" %3i", binary[posCur]); printf(" %3i", binary[posCur]);
puts("\n"); puts("\n");
} }
#endif //#endif
{ // placement { // placement
int x, y, NC, NR, *places; int x, y, NC, NR, *places;
NC = W - 2 * (W / FW); NC = W - 2 * (W / FW);