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

Select symbol with unforced corners if none meets threshold

Browse Source
This commit is contained in:
Robin Stuart 2018-06-20 00:40:36 +01:00
parent 053c83d036
commit 91d933adb7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/dotcode.c
View File

@ -1278,7 +1278,6 @@ int dotcode(struct zint_symbol *symbol, const unsigned char source[], int length
int binary_finish = 0; int binary_finish = 0;
int debug = symbol->debug; int debug = symbol->debug;
int padding_dots, is_first; int padding_dots, is_first;
int corners_forced = 0;
#ifdef _MSC_VER #ifdef _MSC_VER
unsigned char* masked_codeword_array; unsigned char* masked_codeword_array;
#endif #endif
@ -1451,8 +1450,6 @@ int dotcode(struct zint_symbol *symbol, const unsigned char source[], int length
/* Re-evaluate using forced corners if needed */ /* Re-evaluate using forced corners if needed */
if (best_mask <= (height * width) / 2) { if (best_mask <= (height * width) / 2) {
corners_forced = 1;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
apply_mask(i, data_length, masked_codeword_array, codeword_array, ecc_length, dot_stream); apply_mask(i, data_length, masked_codeword_array, codeword_array, ecc_length, dot_stream);
@ -1468,14 +1465,14 @@ int dotcode(struct zint_symbol *symbol, const unsigned char source[], int length
force_corners(width, height, dot_array); force_corners(width, height, dot_array);
mask_score[i] = score_array(dot_array, height, width); mask_score[i + 4] = score_array(dot_array, height, width);
if (debug) { if (debug) {
printf("Mask %d score is %d\n", i, mask_score[i]); printf("Mask %d score is %d\n", i + 4, mask_score[i + 4]);
} }
} }
for (i = 0; i < 4; i++) { for (i = 4; i < 8; i++) {
if (mask_score[i] > high_score) { if (mask_score[i] > high_score) {
high_score = mask_score[i]; high_score = mask_score[i];
best_mask = i; best_mask = i;
@ -1483,8 +1480,12 @@ int dotcode(struct zint_symbol *symbol, const unsigned char source[], int length
} }
} }
if (debug) {
printf("Applying mask %d\n", best_mask);
}
/* Apply best mask */ /* Apply best mask */
apply_mask(i, data_length, masked_codeword_array, codeword_array, ecc_length, dot_stream); apply_mask(best_mask % 4, data_length, masked_codeword_array, codeword_array, ecc_length, dot_stream);
dot_stream_length = make_dotstream(masked_codeword_array, (data_length + ecc_length + 1), dot_stream); dot_stream_length = make_dotstream(masked_codeword_array, (data_length + ecc_length + 1), dot_stream);
@ -1495,7 +1496,7 @@ int dotcode(struct zint_symbol *symbol, const unsigned char source[], int length
fold_dotstream(dot_stream, width, height, dot_array); fold_dotstream(dot_stream, width, height, dot_array);
if (corners_forced) { if (best_mask >= 4) {
force_corners(width, height, dot_array); force_corners(width, height, dot_array);
} }