mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue 675 commit Lachezars great fix for large DM decoding

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1699 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2011-01-11 15:40:47 +00:00
parent 2cd75045fd
commit e6d969b6f4
7 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -33,6 +33,7 @@ Juho Mikkonen
jwicks jwicks
Kevin O'Sullivan (SITA) Kevin O'Sullivan (SITA)
Kevin Xue (NetDragon Websoft Inc., China) Kevin Xue (NetDragon Websoft Inc., China)
Lachezar Dobrev
Luiz Silva Luiz Silva
Luka Finžgar Luka Finžgar
Marcelo Marcelo

10
core/src/com/google/zxing/datamatrix/decoder/Decoder.java
View file

@ -80,22 +80,24 @@ public final class Decoder {
// Separate into data blocks // Separate into data blocks
DataBlock[] dataBlocks = DataBlock.getDataBlocks(codewords, version); DataBlock[] dataBlocks = DataBlock.getDataBlocks(codewords, version);
int dataBlocksCount = dataBlocks.length;
// Count total number of data bytes // Count total number of data bytes
int totalBytes = 0; int totalBytes = 0;
for (int i = 0; i < dataBlocks.length; i++) { for (int i = 0; i < dataBlocksCount; i++) {
totalBytes += dataBlocks[i].getNumDataCodewords(); totalBytes += dataBlocks[i].getNumDataCodewords();
} }
byte[] resultBytes = new byte[totalBytes]; byte[] resultBytes = new byte[totalBytes];
int resultOffset = 0;
// Error-correct and copy data blocks together into a stream of bytes // Error-correct and copy data blocks together into a stream of bytes
for (int j = 0; j < dataBlocks.length; j++) { for (int j = 0; j < dataBlocksCount; j++) {
DataBlock dataBlock = dataBlocks[j]; DataBlock dataBlock = dataBlocks[j];
byte[] codewordBytes = dataBlock.getCodewords(); byte[] codewordBytes = dataBlock.getCodewords();
int numDataCodewords = dataBlock.getNumDataCodewords(); int numDataCodewords = dataBlock.getNumDataCodewords();
correctErrors(codewordBytes, numDataCodewords); correctErrors(codewordBytes, numDataCodewords);
for (int i = 0; i < numDataCodewords; i++) { for (int i = 0; i < numDataCodewords; i++) {
resultBytes[resultOffset++] = codewordBytes[i]; // De-interlace data blocks.
resultBytes[i * dataBlocksCount + j] = codewordBytes[i];
} }
} }

0
core/test/data/blackbox/datamatrix-1/abcd-52x52-IDAutomation.gif.error → core/test/data/blackbox/datamatrix-1/abcd-52x52-IDAutomation.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

0
core/test/data/blackbox/datamatrix-1/abcd-52x52.png.error → core/test/data/blackbox/datamatrix-1/abcd-52x52.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 801 B

After

Width:  |  Height:  |  Size: 801 B

0
core/test/data/blackbox/datamatrix-1/abcdefg-64x64.png.error → core/test/data/blackbox/datamatrix-1/abcdefg-64x64.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

12
core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox1TestCase.java
View file

@ -17,6 +17,7 @@
package com.google.zxing.datamatrix; package com.google.zxing.datamatrix;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.MultiFormatReader;
import com.google.zxing.common.AbstractBlackBoxTestCase; import com.google.zxing.common.AbstractBlackBoxTestCase;
/** /**
@ -25,12 +26,11 @@ import com.google.zxing.common.AbstractBlackBoxTestCase;
public final class DataMatrixBlackBox1TestCase extends AbstractBlackBoxTestCase { public final class DataMatrixBlackBox1TestCase extends AbstractBlackBoxTestCase {
public DataMatrixBlackBox1TestCase() { public DataMatrixBlackBox1TestCase() {
// TODO use MultiFormatReader here once Data Matrix decoder is done super("test/data/blackbox/datamatrix-1", new MultiFormatReader(), BarcodeFormat.DATA_MATRIX);
super("test/data/blackbox/datamatrix-1", new DataMatrixReader(), BarcodeFormat.DATA_MATRIX); addTest(16, 16, 0.0f);
addTest(13, 13, 0.0f); addTest(16, 16, 90.0f);
addTest(13, 13, 90.0f); addTest(16, 16, 180.0f);
addTest(13, 13, 180.0f); addTest(16, 16, 270.0f);
addTest(13, 13, 270.0f);
} }
} }

4
core/test/src/com/google/zxing/datamatrix/DataMatrixBlackBox2TestCase.java
View file

@ -17,6 +17,7 @@
package com.google.zxing.datamatrix; package com.google.zxing.datamatrix;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.MultiFormatReader;
import com.google.zxing.common.AbstractBlackBoxTestCase; import com.google.zxing.common.AbstractBlackBoxTestCase;
/** /**
@ -25,8 +26,7 @@ import com.google.zxing.common.AbstractBlackBoxTestCase;
public final class DataMatrixBlackBox2TestCase extends AbstractBlackBoxTestCase { public final class DataMatrixBlackBox2TestCase extends AbstractBlackBoxTestCase {
public DataMatrixBlackBox2TestCase() { public DataMatrixBlackBox2TestCase() {
// TODO use MultiFormatReader here once Data Matrix decoder is done super("test/data/blackbox/datamatrix-2", new MultiFormatReader(), BarcodeFormat.DATA_MATRIX);
super("test/data/blackbox/datamatrix-2", new DataMatrixReader(), BarcodeFormat.DATA_MATRIX);
addTest(10, 10, 0.0f); addTest(10, 10, 0.0f);
addTest(13, 13, 90.0f); addTest(13, 13, 90.0f);
addTest(16, 16, 180.0f); addTest(16, 16, 180.0f);