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

rMQR bugfix - cater for data lengths which are not multiples of 8 when calculating symbol size

Browse Source
This commit is contained in:
Robin Stuart 2019-11-27 19:32:40 +00:00
parent 05784fb9cf
commit ade31c41fb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/qr.c
View File

@ -3280,14 +3280,14 @@ int rmqr(struct zint_symbol *symbol, const unsigned char source[], size_t length
est_binlen = getBinaryLength(RMQR_VERSION + version, mode, jisdata, length, gs1, symbol->eci); est_binlen = getBinaryLength(RMQR_VERSION + version, mode, jisdata, length, gs1, symbol->eci);
footprint = rmqr_height[version] * rmqr_width[version]; footprint = rmqr_height[version] * rmqr_width[version];
if (ecc_level == LEVEL_M) { if (ecc_level == LEVEL_M) {
if (rmqr_data_codewords_M[version] >= (est_binlen / 8)) { if (8 * rmqr_data_codewords_M[version] >= est_binlen) {
if (footprint < best_footprint) { if (footprint < best_footprint) {
autosize = version; autosize = version;
best_footprint = footprint; best_footprint = footprint;
} }
} }
} else { } else {
if (rmqr_data_codewords_H[version] >= (est_binlen / 8)) { if (8 * rmqr_data_codewords_H[version] >= est_binlen) {
if (footprint < best_footprint) { if (footprint < best_footprint) {
autosize = version; autosize = version;
best_footprint = footprint; best_footprint = footprint;
@ -3310,11 +3310,11 @@ int rmqr(struct zint_symbol *symbol, const unsigned char source[], size_t length
for(i = version - 1; i > rmqr_fixed_height_upper_bound[symbol->option_2 - 33]; i--) { for(i = version - 1; i > rmqr_fixed_height_upper_bound[symbol->option_2 - 33]; i--) {
est_binlen = getBinaryLength(RMQR_VERSION + i, mode, jisdata, length, gs1, symbol->eci); est_binlen = getBinaryLength(RMQR_VERSION + i, mode, jisdata, length, gs1, symbol->eci);
if (ecc_level == LEVEL_M) { if (ecc_level == LEVEL_M) {
if (rmqr_data_codewords_M[i] >= (est_binlen / 8)) { if (8 * rmqr_data_codewords_M[i] >= est_binlen) {
version = i; version = i;
} }
} else { } else {
if (rmqr_data_codewords_H[i] >= (est_binlen / 8)) { if (8 * rmqr_data_codewords_H[i] >= est_binlen) {
version = i; version = i;
} }
} }