Optimize QR data mask recognition (#652)

This commit is contained in:
Sebastian Buchwald 2016-08-22 11:33:43 +02:00 committed by Sean Owen
parent 7805a7551c
commit 70db62d11b

View file

@ -89,8 +89,7 @@ enum DataMask {
DATA_MASK_101() { DATA_MASK_101() {
@Override @Override
boolean isMasked(int i, int j) { boolean isMasked(int i, int j) {
int temp = i * j; return (i * j) % 6 == 0;
return (temp & 0x01) + (temp % 3) == 0;
} }
}, },
@ -101,7 +100,7 @@ enum DataMask {
@Override @Override
boolean isMasked(int i, int j) { boolean isMasked(int i, int j) {
int temp = i * j; int temp = i * j;
return (((temp & 0x01) + (temp % 3)) & 0x01) == 0; return ((temp + (temp % 3)) & 0x01) == 0;
} }
}, },
@ -111,7 +110,7 @@ enum DataMask {
DATA_MASK_111() { DATA_MASK_111() {
@Override @Override
boolean isMasked(int i, int j) { boolean isMasked(int i, int j) {
return ((((i + j) & 0x01) + ((i * j) % 3)) & 0x01) == 0; return ((i + j + ((i * j) % 3)) & 0x01) == 0;
} }
}; };