status-im
/
QR-Code-generator
mirror of https://github.com/status-im/QR-Code-generator.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed a constant value in QrSegmentAdvanced, which affects how the optimal segment switching is selected.

This commit is contained in:
Project Nayuki 2017-02-10 03:17:18 +00:00
parent bd470926ca
commit 8033f9cec0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/io/nayuki/qrcodegen/QrSegmentAdvanced.java
View File

@ -109,7 +109,7 @@ public final class QrSegmentAdvanced {
char c = (char)data[i]; char c = (char)data[i];
result[0][j] = result[0][i] + 48; // 8 bits per byte result[0][j] = result[0][i] + 48; // 8 bits per byte
if (isAlphanumeric(c)) if (isAlphanumeric(c))
result[1][j] = result[1][i] + 39; // 6.5 bits per alphanumeric char result[1][j] = result[1][i] + 33; // 5.5 bits per alphanumeric char
if (isNumeric(c)) if (isNumeric(c))
result[2][j] = result[2][i] + 20; // 3.33 bits per alphanumeric char result[2][j] = result[2][i] + 20; // 3.33 bits per alphanumeric char
@ -148,7 +148,7 @@ public final class QrSegmentAdvanced {
if (curMode == NUMERIC) { if (curMode == NUMERIC) {
if (isNumeric(c)) if (isNumeric(c))
curMode = NUMERIC; curMode = NUMERIC;
else if (isAlphanumeric(c) && (bitCosts[1][i] + 39 + 5) / 6 * 6 + numberCost == bitCosts[2][i + 1]) else if (isAlphanumeric(c) && (bitCosts[1][i] + 33 + 5) / 6 * 6 + numberCost == bitCosts[2][i + 1])
curMode = ALPHANUMERIC; curMode = ALPHANUMERIC;
else else
curMode = BYTE; curMode = BYTE;
@ -162,7 +162,7 @@ public final class QrSegmentAdvanced {
} else if (curMode == BYTE) { } else if (curMode == BYTE) {
if (isNumeric(c) && (bitCosts[2][i] + 20 + 5) / 6 * 6 + bytesCost == bitCosts[0][i + 1]) if (isNumeric(c) && (bitCosts[2][i] + 20 + 5) / 6 * 6 + bytesCost == bitCosts[0][i + 1])
curMode = NUMERIC; curMode = NUMERIC;
else if (isAlphanumeric(c) && (bitCosts[1][i] + 39 + 5) / 6 * 6 + bytesCost == bitCosts[0][i + 1]) else if (isAlphanumeric(c) && (bitCosts[1][i] + 33 + 5) / 6 * 6 + bytesCost == bitCosts[0][i + 1])
curMode = ALPHANUMERIC; curMode = ALPHANUMERIC;
else else
curMode = BYTE; curMode = BYTE;