mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 05:27:32 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Aztec decoder returns raw bytes

Browse source 
The Aztec decoder now packs the code bits into bytes and returns them as
"raw bytes", even though the error correction codes and stuffing have
been already removed.  Also added a couple of tests for the byte-packing
function.
This commit is contained in:
Taneli Huuskonen 2016-05-05 15:10:44 +03:00
parent 05a415f1a0
commit e9896d03a6
2 changed files with 57 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/src/main/java/com/google/zxing/aztec/decoder/Decoder.java
View file

@ -75,8 +75,9 @@ public final class Decoder {
BitMatrix matrix = detectorResult.getBits();
boolean[] rawbits = extractBits(matrix);
boolean[] correctedBits = correctBits(rawbits);
byte[] rawBytes = convertBoolArrayToByteArray(correctedBits);
String result = getEncodedData(correctedBits);
return new DecoderResult(null, result, null, null);
return new DecoderResult(rawBytes, result, null, null);
}
// This method is used for testing the high-level encoder
@ -332,6 +333,28 @@ public final class Decoder {
return res;
}
/**
* Reads a code of length 8 in an array of bits, padding with zeros
*/
private static byte readByte(boolean[] rawbits, int startIndex) {
int n = rawbits.length - startIndex;
if (n >= 8) {
return (byte) readCode(rawbits, startIndex, 8);
}
return (byte) (readCode(rawbits, startIndex, n) << (8 - n));
}
/**
* Packs a bit array into bytes, most significant bit first
*/
public static byte[] convertBoolArrayToByteArray(boolean[] boolArr) {
byte[] byteArr = new byte[(boolArr.length + 7) / 8];
for (int i = 0; i < byteArr.length; i++) {
byteArr[i] = readByte(boolArr, 8 * i);
}
return byteArr;
}
private static int totalBitsInLayer(int layers, boolean compact) {
return ((compact ? 88 : 112) + 16 * layers) * layers;
}

34
core/src/test/java/com/google/zxing/aztec/decoder/DecoderTest.java
View file

@ -20,8 +20,9 @@ import com.google.zxing.ResultPoint;
import com.google.zxing.aztec.AztecDetectorResult;
import com.google.zxing.common.BitMatrix;
import org.junit.Test;
import org.junit.Assert;
public final class DecoderTest {
public final class DecoderTest extends Assert {
private static final ResultPoint[] NO_POINTS = new ResultPoint[0];
@ -105,4 +106,35 @@ public final class DecoderTest {
new Decoder().decode(r);
}
private static void assertEqualByteArrays(byte[] b1, byte[] b2) {
assertEquals(b1.length, b2.length);
for (int i = 0; i < b1.length; i++) {
assertEquals(b1[i], b2[i]);
}
}
@Test
public void testRawBytes() {
boolean bool0[] = {};
boolean bool1[] = { true };
boolean bool7[] = { true, false, true, false, true, false, true };
boolean bool8[] = { true, false, true, false, true, false, true, false };
boolean bool9[] = { true, false, true, false, true, false, true, false,
true };
boolean bool16[] = { false, true, true, false, false, false, true, true,
true, true, false, false, false, false, false, true };
byte byte0[] = {};
byte byte1[] = { -128 };
byte byte7[] = { -86 };
byte byte8[] = { -86 };
byte byte9[] = { -86, -128 };
byte byte16[] = { 99, -63 };
assertEqualByteArrays(byte0, Decoder.convertBoolArrayToByteArray(bool0));
assertEqualByteArrays(byte1, Decoder.convertBoolArrayToByteArray(bool1));
assertEqualByteArrays(byte7, Decoder.convertBoolArrayToByteArray(bool7));
assertEqualByteArrays(byte8, Decoder.convertBoolArrayToByteArray(bool8));
assertEqualByteArrays(byte9, Decoder.convertBoolArrayToByteArray(bool9));
assertEqualByteArrays(byte16, Decoder.convertBoolArrayToByteArray(bool16));
}
}