Merge pull request #3 from wslbal/master

pull request
pull/90/head
gerzees 5 years ago committed by GitHub
commit c30ed6a968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,17 @@
package io.nayuki.qrcodegen;
public class Button {
public Command theCommand;
public Button(Command theCommand) {
setCommand(theCommand);
}
public void setCommand(Command newCommand) {
this.theCommand = newCommand;
}
public boolean pressed(int y, int x, int msk) {
return theCommand.excute(y, x, msk);
}
}

@ -0,0 +1,5 @@
package io.nayuki.qrcodegen;
public interface Command {
public abstract boolean excute(int y, int x, int msk);
}

@ -0,0 +1,7 @@
package io.nayuki.qrcodegen;
public class Msk0 {
public boolean operation(int y, int x, int msk) {
return ((x + y) % 2 == 0);
}
}

@ -0,0 +1,7 @@
package io.nayuki.qrcodegen;
public class Msk1 {
public boolean operation(int y, int x, int msk) {
return (y % 2 == 0);
}
}

@ -0,0 +1,7 @@
package io.nayuki.qrcodegen;
public class Msk2 {
public boolean operation(int y, int x, int msk) {
return (x % 3 == 0);
}
}

@ -0,0 +1,7 @@
package io.nayuki.qrcodegen;
public class Msk3 {
public boolean operation(int y, int x, int msk) {
return ((x + y) % 3 == 0);
}
}

@ -0,0 +1,7 @@
package io.nayuki.qrcodegen;
public class Msk4 {
public boolean operation(int y, int x, int msk) {
return ((x / 3 + y / 2) % 2 == 0);
}
}

@ -0,0 +1,7 @@
package io.nayuki.qrcodegen;
public class Msk5 {
public boolean operation(int y, int x, int msk) {
return (x * y % 2 + x * y % 3 == 0);
}
}

@ -0,0 +1,7 @@
package io.nayuki.qrcodegen;
public class Msk6 {
public boolean operation(int y, int x, int msk) {
return ((x * y % 2 + x * y % 3) % 2 == 0);
}
}

@ -0,0 +1,7 @@
package io.nayuki.qrcodegen;
public class Msk7 {
public boolean operation(int y, int x, int msk) {
return (((x + y) % 2 + x * y % 3) % 2 == 0);
}
}

@ -0,0 +1,46 @@
package io.nayuki.qrcodegen;
public class MskCommandFactory {
public static Command getCommand(int msk) {
Command theCommand = null;
Msk0 msk0 = new Msk0();
Msk1 msk1 = new Msk1();
Msk2 msk2 = new Msk2();
Msk3 msk3 = new Msk3();
Msk4 msk4 = new Msk4();
Msk5 msk5 = new Msk5();
Msk6 msk6 = new Msk6();
Msk7 msk7 = new Msk7();
switch (msk) {
case 0:
theCommand = new msk0Command(msk0);
break;
case 1:
theCommand = new msk1Command(msk1);
break;
case 2:
theCommand = new msk2Command(msk2);
break;
case 3:
theCommand = new msk3Command(msk3);
break;
case 4:
theCommand = new msk4Command(msk4);
break;
case 5:
theCommand = new msk5Command(msk5);
break;
case 6:
theCommand = new msk6Command(msk6);
break;
case 7:
theCommand = new msk7Command(msk7);
break;
default:
throw new AssertionError();
}
return theCommand;
}
}

@ -580,23 +580,20 @@ public final class QrCode {
// before masking. Due to the arithmetic of XOR, calling applyMask() with
// the same mask value a second time will undo the mask. A final well-formed
// QR Code needs exactly one (not zero, two, etc.) mask applied.
private void applyMask(int msk) {
if (msk < 0 || msk > 7)
throw new IllegalArgumentException("Mask value out of range");
for (int y = 0; y < size; y++) {
for (int x = 0; x < size; x++) {
boolean invert;
switch (msk) {
case 0: invert = (x + y) % 2 == 0; break;
case 1: invert = y % 2 == 0; break;
case 2: invert = x % 3 == 0; break;
case 3: invert = (x + y) % 3 == 0; break;
case 4: invert = (x / 3 + y / 2) % 2 == 0; break;
case 5: invert = x * y % 2 + x * y % 3 == 0; break;
case 6: invert = (x * y % 2 + x * y % 3) % 2 == 0; break;
case 7: invert = ((x + y) % 2 + x * y % 3) % 2 == 0; break;
default: throw new AssertionError();
}
Command mskCommand = MskCommandFactory.getCommand(msk);
Button button = new Button(mskCommand);
invert = button.pressed(y, x, msk);
modules[y][x] ^= invert & !isFunction[y][x];
}
}
@ -635,9 +632,31 @@ public final class QrCode {
}
private int havingSameColor(int run, boolean runColor, int[] runHistory, int result, int y, int x) {
if (modules[y][x] == runColor) {
run++;
if (run == 5)
result += PENALTY_N1;
else if (run > 5)
result++;
} else {
finderPenaltyAddHistory(run, runHistory);
if (!runColor)
result += finderPenaltyCountPatterns(runHistory) * PENALTY_N3;
runColor = modules[y][x];
run = 1;
}
return result;
}
// Calculates and returns the penalty score based on state of this QR Code's current modules.
// This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score.
private int getPenaltyScore() {
int result = 0;
// Adjacent modules in row having same color, and finder-like patterns
@ -646,19 +665,7 @@ public final class QrCode {
int runX = 0;
int[] runHistory = new int[7];
for (int x = 0; x < size; x++) {
if (modules[y][x] == runColor) {
runX++;
if (runX == 5)
result += PENALTY_N1;
else if (runX > 5)
result++;
} else {
finderPenaltyAddHistory(runX, runHistory);
if (!runColor)
result += finderPenaltyCountPatterns(runHistory) * PENALTY_N3;
runColor = modules[y][x];
runX = 1;
}
result += havingSameColor(runX, runColor, runHistory, result, y, x);
}
result += finderPenaltyTerminateAndCount(runColor, runX, runHistory) * PENALTY_N3;
}
@ -668,33 +675,13 @@ public final class QrCode {
int runY = 0;
int[] runHistory = new int[7];
for (int y = 0; y < size; y++) {
if (modules[y][x] == runColor) {
runY++;
if (runY == 5)
result += PENALTY_N1;
else if (runY > 5)
result++;
} else {
finderPenaltyAddHistory(runY, runHistory);
if (!runColor)
result += finderPenaltyCountPatterns(runHistory) * PENALTY_N3;
runColor = modules[y][x];
runY = 1;
}
result += havingSameColor(runY, runColor, runHistory, result, y, x);
}
result += finderPenaltyTerminateAndCount(runColor, runY, runHistory) * PENALTY_N3;
}
// 2*2 blocks of modules having same color
for (int y = 0; y < size - 1; y++) {
for (int x = 0; x < size - 1; x++) {
boolean color = modules[y][x];
if ( color == modules[y][x + 1] &&
color == modules[y + 1][x] &&
color == modules[y + 1][x + 1])
result += PENALTY_N2;
}
}
result += twobytwoHavingSameColor(modules);
// Balance of black and white modules
int black = 0;
@ -711,7 +698,20 @@ public final class QrCode {
return result;
}
private int twobytwoHavingSameColor(boolean[][] modules) {
int result = 0;
// 2*2 blocks of modules having same color.
for (int y = 0; y < size - 1; y++) {
for (int x = 0; x < size - 1; x++) {
boolean color = modules[y][x];
if ( color == modules[y][x + 1] &&
color == modules[y + 1][x] &&
color == modules[y + 1][x + 1])
result += PENALTY_N2;
}
}
return result;
}
/*---- Private helper functions ----*/
@ -744,6 +744,13 @@ public final class QrCode {
if (ver < MIN_VERSION || ver > MAX_VERSION)
throw new IllegalArgumentException("Version number out of range");
int result = calculateNumOfModules(ver);
assert 208 <= result && result <= 29648;
return result;
}
private static int calculateNumOfModules(int ver) {
int size = ver * 4 + 17;
int result = size * size; // Number of modules in the whole QR Code square
result -= 8 * 8 * 3; // Subtract the three finders with separators
@ -758,11 +765,9 @@ public final class QrCode {
if (ver >= 7)
result -= 6 * 3 * 2; // Subtract version information
}
assert 208 <= result && result <= 29648;
return result;
}
// Returns a Reed-Solomon ECC generator polynomial for the given degree. This could be
// implemented as a lookup table over all possible parameter values, instead of as an algorithm.
private static byte[] reedSolomonComputeDivisor(int degree) {
@ -810,14 +815,14 @@ public final class QrCode {
// are unsigned 8-bit integers. This could be implemented as a lookup table of 256*256 entries of uint8.
private static int reedSolomonMultiply(int x, int y) {
assert x >> 8 == 0 && y >> 8 == 0;
// Russian peasant multiplication
int z = 0;
for (int i = 7; i >= 0; i--) {
z = (z << 1) ^ ((z >>> 7) * 0x11D);
z ^= ((y >>> i) & 1) * x;
}
assert z >>> 8 == 0;
return z;
// Russian peasant multiplication
int z = 0;
for (int i = 7; i >= 0; i--) {
z = (z << 1) ^ ((z >>> 7) * 0x11D);
z ^= ((y >>> i) & 1) * x;
}
assert z >>> 8 == 0;
return z;
}
@ -826,8 +831,8 @@ public final class QrCode {
// This stateless pure function could be implemented as a (40*4)-cell lookup table.
static int getNumDataCodewords(int ver, Ecc ecl) {
return getNumRawDataModules(ver) / 8
- ECC_CODEWORDS_PER_BLOCK [ecl.ordinal()][ver]
* NUM_ERROR_CORRECTION_BLOCKS[ecl.ordinal()][ver];
- ECC_CODEWORDS_PER_BLOCK [ecl.ordinal()][ver]
* NUM_ERROR_CORRECTION_BLOCKS[ecl.ordinal()][ver];
}
@ -838,7 +843,7 @@ public final class QrCode {
assert n <= size * 3;
boolean core = n > 0 && runHistory[2] == n && runHistory[3] == n * 3 && runHistory[4] == n && runHistory[5] == n;
return (core && runHistory[0] >= n * 4 && runHistory[6] >= n ? 1 : 0)
+ (core && runHistory[6] >= n * 4 && runHistory[0] >= n ? 1 : 0);
+ (core && runHistory[6] >= n * 4 && runHistory[0] >= n ? 1 : 0);
}
@ -886,21 +891,21 @@ public final class QrCode {
private static final byte[][] ECC_CODEWORDS_PER_BLOCK = {
// Version: (note that index 0 is for padding, and is set to an illegal value)
//0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level
{-1, 7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Low
{-1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28}, // Medium
{-1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Quartile
{-1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // High
// Version: (note that index 0 is for padding, and is set to an illegal value)
//0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level
{-1, 7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Low
{-1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28}, // Medium
{-1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Quartile
{-1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // High
};
private static final byte[][] NUM_ERROR_CORRECTION_BLOCKS = {
// Version: (note that index 0 is for padding, and is set to an illegal value)
//0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level
{-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 6, 6, 6, 6, 7, 8, 8, 9, 9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25}, // Low
{-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5, 5, 8, 9, 9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49}, // Medium
{-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8, 8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68}, // Quartile
{-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81}, // High
// Version: (note that index 0 is for padding, and is set to an illegal value)
//0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level
{-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 6, 6, 6, 6, 7, 8, 8, 9, 9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25}, // Low
{-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5, 5, 8, 9, 9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49}, // Medium
{-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8, 8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68}, // Quartile
{-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81}, // High
};

@ -0,0 +1,13 @@
package io.nayuki.qrcodegen;
public class msk0Command implements Command{
private Msk0 theMsk0;
public msk0Command(Msk0 theMsk0) {
this.theMsk0 = theMsk0;
}
public boolean excute(int y, int x, int msk) {
return theMsk0.operation(y, x, msk);
}
}

@ -0,0 +1,13 @@
package io.nayuki.qrcodegen;
public class msk1Command implements Command {
private Msk1 theMsk1;
public msk1Command(Msk1 theMsk1) {
this.theMsk1 = theMsk1;
}
public boolean excute(int y, int x, int msk) {
return theMsk1.operation(y, x, msk);
}
}

@ -0,0 +1,13 @@
package io.nayuki.qrcodegen;
public class msk2Command implements Command {
private Msk2 theMsk2;
public msk2Command(Msk2 theMsk2) {
this.theMsk2 = theMsk2;
}
public boolean excute(int y, int x, int msk) {
return theMsk2.operation(y, x, msk);
}
}

@ -0,0 +1,13 @@
package io.nayuki.qrcodegen;
public class msk3Command implements Command {
private Msk3 theMsk3;
public msk3Command(Msk3 theMsk3) {
this.theMsk3 = theMsk3;
}
public boolean excute(int y, int x, int msk) {
return theMsk3.operation(y, x, msk);
}
}

@ -0,0 +1,13 @@
package io.nayuki.qrcodegen;
public class msk4Command implements Command {
private Msk4 theMsk4;
public msk4Command(Msk4 theMsk4) {
this.theMsk4 = theMsk4;
}
public boolean excute(int y, int x, int msk) {
return theMsk4.operation(y, x, msk);
}
}

@ -0,0 +1,13 @@
package io.nayuki.qrcodegen;
public class msk5Command implements Command {
private Msk5 theMsk5;
public msk5Command(Msk5 theMsk5) {
this.theMsk5 = theMsk5;
}
public boolean excute(int y, int x, int msk) {
return theMsk5.operation(y, x, msk);
}
}

@ -0,0 +1,13 @@
package io.nayuki.qrcodegen;
public class msk6Command implements Command {
private Msk6 theMsk6;
public msk6Command(Msk6 theMsk6) {
this.theMsk6 = theMsk6;
}
public boolean excute(int y, int x, int msk) {
return theMsk6.operation(y, x, msk);
}
}

@ -0,0 +1,13 @@
package io.nayuki.qrcodegen;
public class msk7Command implements Command {
private Msk7 theMsk7;
public msk7Command(Msk7 theMsk7) {
this.theMsk7 = theMsk7;
}
public boolean excute(int y, int x, int msk) {
return theMsk7.operation(y, x, msk);
}
}
Loading…
Cancel
Save