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

Added helper function to Java QrSegmentAdvanced to clarify code.

This commit is contained in:
Project Nayuki 2018-08-25 23:05:31 +00:00
parent ecfa0a83c1
commit 432f3e0fed
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,9 +113,9 @@ public final class QrSegmentAdvanced {
result[2][j] = result[2][i] + 20; // 3.33 bits per digit result[2][j] = result[2][i] + 20; // 3.33 bits per digit
// Switch modes, rounding up fractional bits // Switch modes, rounding up fractional bits
result[0][j] = Math.min((Math.min(result[1][j], result[2][j]) + 5) / 6 * 6 + bytesCost , result[0][j]); result[0][j] = Math.min(roundUp6(Math.min(result[1][j], result[2][j])) + bytesCost , result[0][j]);
result[1][j] = Math.min((Math.min(result[2][j], result[0][j]) + 5) / 6 * 6 + alphnumCost, result[1][j]); result[1][j] = Math.min(roundUp6(Math.min(result[2][j], result[0][j])) + alphnumCost, result[1][j]);
result[2][j] = Math.min((Math.min(result[0][j], result[1][j]) + 5) / 6 * 6 + numberCost , result[2][j]); result[2][j] = Math.min(roundUp6(Math.min(result[0][j], result[1][j])) + numberCost , result[2][j]);
} }
return result; return result;
} }
@ -147,21 +147,21 @@ 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] + 33 + 5) / 6 * 6 + numberCost == bitCosts[2][i + 1]) else if (isAlphanumeric(c) && roundUp6(bitCosts[1][i] + 33) + numberCost == bitCosts[2][i + 1])
curMode = ALPHANUMERIC; curMode = ALPHANUMERIC;
else else
curMode = BYTE; curMode = BYTE;
} else if (curMode == ALPHANUMERIC) { } else if (curMode == ALPHANUMERIC) {
if (isNumeric(c) && (bitCosts[2][i] + 20 + 5) / 6 * 6 + alphnumCost == bitCosts[1][i + 1]) if (isNumeric(c) && roundUp6(bitCosts[2][i] + 20) + alphnumCost == bitCosts[1][i + 1])
curMode = NUMERIC; curMode = NUMERIC;
else if (isAlphanumeric(c)) else if (isAlphanumeric(c))
curMode = ALPHANUMERIC; curMode = ALPHANUMERIC;
else else
curMode = BYTE; curMode = BYTE;
} 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) && roundUp6(bitCosts[2][i] + 20) + bytesCost == bitCosts[0][i + 1])
curMode = NUMERIC; curMode = NUMERIC;
else if (isAlphanumeric(c) && (bitCosts[1][i] + 33 + 5) / 6 * 6 + bytesCost == bitCosts[0][i + 1]) else if (isAlphanumeric(c) && roundUp6(bitCosts[1][i] + 33) + bytesCost == bitCosts[0][i + 1])
curMode = ALPHANUMERIC; curMode = ALPHANUMERIC;
else else
curMode = BYTE; curMode = BYTE;
@ -224,6 +224,11 @@ public final class QrSegmentAdvanced {
} }
private static int roundUp6(int x) {
return (x + 5) / 6 * 6;
}
/*---- Kanji mode segment encoder ----*/ /*---- Kanji mode segment encoder ----*/