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

QRCODE: refactor last commit to separate out GS1 branch in

Browse Source 
`qr_in_alpha()`
This commit is contained in:
gitlost 2023-12-05 22:47:46 +00:00
parent 885cf0610d
commit fe56c030b0
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/qr.c
View File

@ -101,7 +101,8 @@ static int qr_in_alpha(const unsigned int ddata[], const int length, const int i
/* Attempt to calculate the average 'cost' of using alphanumeric mode in number of bits (times QR_MULT) */ /* Attempt to calculate the average 'cost' of using alphanumeric mode in number of bits (times QR_MULT) */
if (in_posn < (int) *p_end) { if (in_posn < (int) *p_end) {
if (gs1 && *p_pcent) { if (gs1) {
if (*p_pcent) {
/* Previous 2nd char was a percent, so allow for second half of doubled-up percent here */ /* Previous 2nd char was a percent, so allow for second half of doubled-up percent here */
two_alphas = !last && qr_is_alpha(ddata[in_posn + 1], gs1); two_alphas = !last && qr_is_alpha(ddata[in_posn + 1], gs1);
/* Uneven percents means this will fit evenly in alpha pair */ /* Uneven percents means this will fit evenly in alpha pair */
@ -109,7 +110,10 @@ static int qr_in_alpha(const unsigned int ddata[], const int length, const int i
*p_pcent = 0; *p_pcent = 0;
} else { } else {
/* As above, uneven percents means will fit in alpha pair */ /* As above, uneven percents means will fit in alpha pair */
*p_cost = !last || (gs1 && !(*p_pccnt & 1)) ? 33 /* (11 / 2) * QR_MULT */ : 36 /* 6 * QR_MULT */; *p_cost = !last || !(*p_pccnt & 1) ? 33 /* (11 / 2) * QR_MULT */ : 36 /* 6 * QR_MULT */;
}
} else {
*p_cost = !last ? 33 /* (11 / 2) * QR_MULT */ : 36 /* 6 * QR_MULT */;
} }
return 1; return 1;
} }
@ -133,10 +137,14 @@ static int qr_in_alpha(const unsigned int ddata[], const int length, const int i
} }
*p_end = two_alphas ? in_posn + 2 : in_posn + 1; *p_end = two_alphas ? in_posn + 2 : in_posn + 1;
*p_pcent = two_alphas && gs1 && ddata[in_posn + 1] == '%'; /* 2nd char is percent */ if (gs1) {
*p_pccnt += *p_pcent; /* No-op unless `gs1` */ *p_pcent = two_alphas && ddata[in_posn + 1] == '%'; /* 2nd char is percent */
*p_pccnt += *p_pcent;
/* Uneven percents means will fit in alpha pair */ /* Uneven percents means will fit in alpha pair */
*p_cost = two_alphas || (gs1 && !(*p_pccnt & 1)) ? 33 /* (11 / 2) * QR_MULT */ : 36 /* 6 * QR_MULT */; *p_cost = two_alphas || !(*p_pccnt & 1) ? 33 /* (11 / 2) * QR_MULT */ : 36 /* 6 * QR_MULT */;
} else {
*p_cost = two_alphas ? 33 /* (11 / 2) * QR_MULT */ : 36 /* 6 * QR_MULT */;
}
return 1; return 1;
} }