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

Pad only with character 109 when finishing in binary mode

Browse Source 
Bug report by Milton Neil
This commit is contained in:
Robin Stuart 2017-02-14 18:01:48 +00:00
parent a77e448df5
commit 025a485ddf
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/dotcode.c
View File

@ -363,7 +363,7 @@ int binary(const unsigned char source[], int position, int length) {
} }
/* Analyse input data stream and encode using algorithm from Annex F */ /* Analyse input data stream and encode using algorithm from Annex F */
int dotcode_encode_message(struct zint_symbol *symbol, const unsigned char source[], int length, unsigned char *codeword_array) { int dotcode_encode_message(struct zint_symbol *symbol, const unsigned char source[], int length, unsigned char *codeword_array, int *binary_finish) {
int input_position, array_length, i; int input_position, array_length, i;
char encoding_mode; char encoding_mode;
int inside_macro, done; int inside_macro, done;
@ -881,6 +881,10 @@ int dotcode_encode_message(struct zint_symbol *symbol, const unsigned char sourc
} }
} while (input_position < length); } while (input_position < length);
if (encoding_mode == 'X') {
*(binary_finish) = 1;
}
if (debug) { if (debug) {
printf("\n\n"); printf("\n\n");
} }
@ -1045,6 +1049,7 @@ int dotcode(struct zint_symbol *symbol, const unsigned char source[], int length
int weight; int weight;
size_t dot_stream_length; size_t dot_stream_length;
int high_score, best_mask; int high_score, best_mask;
int binary_finish = 0;
int debug = 0; int debug = 0;
#ifndef _MSC_VER #ifndef _MSC_VER
@ -1057,7 +1062,7 @@ int dotcode(struct zint_symbol *symbol, const unsigned char source[], int length
unsigned char* masked_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 */ #endif /* _MSC_VER */
data_length = dotcode_encode_message(symbol, source, length, codeword_array); data_length = dotcode_encode_message(symbol, source, length, codeword_array, &binary_finish);
ecc_length = 3 + (data_length / 2); ecc_length = 3 + (data_length / 2);
@ -1139,7 +1144,7 @@ int dotcode(struct zint_symbol *symbol, const unsigned char source[], int length
/* Add pad characters */ /* 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) { if ((pad_chars > 0) && (binary_finish == 1)) {
codeword_array[data_length] = 109; // Latch to Code Set A codeword_array[data_length] = 109; // Latch to Code Set A
data_length++; data_length++;
pad_chars--; pad_chars--;