Another attack on integrating encoder and decoder: Version is done. Attempted to...

[zxing.git] / core / src / com / google / zxing / qrcode / decoder / DataBlock.java

diff --git a/core/src/com/google/zxing/qrcode/decoder/DataBlock.java b/core/src/com/google/zxing/qrcode/decoder/DataBlock.java
index 259a8ac..a517611 100755 (executable)
--- a/core/src/com/google/zxing/qrcode/decoder/DataBlock.java
+++ b/core/src/com/google/zxing/qrcode/decoder/DataBlock.java
@@ -65,7 +65,7 @@ final class DataBlock {
       Version.ECB ecBlock = ecBlockArray[j];\r
       for (int i = 0; i < ecBlock.getCount(); i++) {\r
         int numDataCodewords = ecBlock.getDataCodewords();\r
-        int numBlockCodewords = ecBlocks.getECCodewords() + numDataCodewords;\r
+        int numBlockCodewords = ecBlocks.getECCodewordsPerBlock() + numDataCodewords;\r
         result[numResultBlocks++] = new DataBlock(numDataCodewords, new byte[numBlockCodewords]);\r
       }\r
     }\r
@@ -86,7 +86,7 @@ final class DataBlock {
     }\r
     longerBlocksStartAt++;\r
 \r
-    int shorterBlocksNumDataCodewords = shorterBlocksTotalCodewords - ecBlocks.getECCodewords();\r
+    int shorterBlocksNumDataCodewords = shorterBlocksTotalCodewords - ecBlocks.getECCodewordsPerBlock();\r
     // The last elements of result may be 1 element longer;\r
     // first fill out as many elements as all of them have\r
     int rawCodewordsOffset = 0;\r