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

Remove all 1 and all 0 codeword detection bug

Browse Source
This commit is contained in:
hooper114 2009-08-04 18:59:29 +00:00
parent 1f4bbf2965
commit 46c6430276
1 changed files with 57 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
backend/aztec.c
View File

@ -774,31 +774,54 @@ int aztec(struct zint_symbol *symbol, unsigned char source[])
if((layers >= 9) && (layers <= 22)) { codeword_size = 10; } if((layers >= 9) && (layers <= 22)) { codeword_size = 10; }
if(layers >= 23) { codeword_size = 12; } if(layers >= 23) { codeword_size = 12; }
j = 0; j = 0; i = 0;
count = 0; do {
for(i = 0; i <= data_length; i++) { if((j + 1) % codeword_size == 0) {
remainder = i % codeword_size;
if(remainder == codeword_size - 1) {
/* Last bit of codeword */ /* Last bit of codeword */
if(count == codeword_size - 1) { int t, done = 0;
/* All 1s - add 0 */ count = 0;
/* Discover how many '1's in current codeword */
for(t = 0; t < (codeword_size - 1); t++) {
if(binary_string[(i - (codeword_size - 1)) + t] == '1') count++;
}
if(count == (codeword_size - 1)) {
adjusted_string[j] = '0'; adjusted_string[j] = '0';
j++; j++;
done = 1;
} }
if(count == 0) { if(count == 0) {
/* All 0s - add 1 */
adjusted_string[j] = '1'; adjusted_string[j] = '1';
j++; j++;
done = 1;
}
if(done == 0) {
adjusted_string[j] = binary_string[i];
j++;
i++;
} }
count = 0;
} }
if(binary_string[i] == '1') count++;
adjusted_string[j] = binary_string[i]; adjusted_string[j] = binary_string[i];
j++; j++;
} i++;
} while (i <= (data_length + 1));
adjusted_string[j] = '\0'; adjusted_string[j] = '\0';
adjusted_length = strlen(adjusted_string); adjusted_length = strlen(adjusted_string);
adjustment_size = adjusted_length - data_length; adjustment_size = adjusted_length - data_length;
if(debug) {
printf("Codewords:\n");
for(i = 0; i < (adjusted_length / codeword_size); i++) {
for(j = 0; j < codeword_size; j++) {
printf("%c", adjusted_string[(i * codeword_size) + j]);
}
printf("\n");
}
}
/* Only important if this loop is repeated */ /* Only important if this loop is repeated */
remainder = adjusted_length % codeword_size; remainder = adjusted_length % codeword_size;
@ -842,28 +865,40 @@ int aztec(struct zint_symbol *symbol, unsigned char source[])
if((layers >= 9) && (layers <= 22)) { codeword_size = 10; } if((layers >= 9) && (layers <= 22)) { codeword_size = 10; }
if(layers >= 23) { codeword_size = 12; } if(layers >= 23) { codeword_size = 12; }
j = 0; j = 0; i = 0;
count = 0; do {
for(i = 0; i <= data_length; i++) { if((j + 1) % codeword_size == 0) {
remainder = i % codeword_size;
if(remainder == codeword_size - 1) {
/* Last bit of codeword */ /* Last bit of codeword */
if(count == codeword_size - 1) { int t, done = 0;
/* All 1s - add 0 */ count = 0;
/* Discover how many '1's in current codeword */
for(t = 0; t < (codeword_size - 1); t++) {
if(binary_string[(i - (codeword_size - 1)) + t] == '1') count++;
}
if(count == (codeword_size - 1)) {
adjusted_string[j] = '0'; adjusted_string[j] = '0';
j++; j++;
done = 1;
} }
if(count == 0) { if(count == 0) {
/* All 0s - add 1 */
adjusted_string[j] = '1'; adjusted_string[j] = '1';
j++; j++;
done = 1;
}
if(done == 0) {
adjusted_string[j] = binary_string[i];
j++;
i++;
} }
count = 0;
} }
if(binary_string[i] == '1') count++;
adjusted_string[j] = binary_string[i]; adjusted_string[j] = binary_string[i];
j++; j++;
} i++;
} while (i <= (data_length + 1));
adjusted_string[j] = '\0'; adjusted_string[j] = '\0';
adjusted_length = strlen(adjusted_string); adjusted_length = strlen(adjusted_string);