/*\r
- * Copyright 2007 Google Inc.\r
+ * Copyright 2007 ZXing authors\r
*\r
* Licensed under the Apache License, Version 2.0 (the "License");\r
* you may not use this file except in compliance with the License.\r
/**\r
* See ISO 18004:2006 Annex D\r
*\r
- * @author srowen@google.com (Sean Owen)\r
+ * @author Sean Owen\r
*/\r
public final class Version {\r
\r
* See ISO 18004:2006 Annex D.\r
* Element i represents the raw version bits that specify version i + 7\r
*/\r
- private static final int[] VERSION_DECODE_INFO = new int[]{\r
+ private static final int[] VERSION_DECODE_INFO = {\r
0x07C94, 0x085BC, 0x09A99, 0x0A4D3, 0x0BBF6,\r
0x0C762, 0x0D847, 0x0E60D, 0x0F928, 0x10B78,\r
0x1145D, 0x12A17, 0x13532, 0x149A6, 0x15683,\r
this.alignmentPatternCenters = alignmentPatternCenters;\r
this.ecBlocks = new ECBlocks[]{ecBlocks1, ecBlocks2, ecBlocks3, ecBlocks4};\r
int total = 0;\r
- ECBlocks levelLECBlocks = ecBlocks1; // L,M,Q,H -- all the same total\r
- int ecCodewords = levelLECBlocks.ecCodewords;\r
- ECB[] ecbArray = levelLECBlocks.ecBlocks;\r
+ int ecCodewords = ecBlocks1.getECCodewords();\r
+ ECB[] ecbArray = ecBlocks1.getECBlocks();\r
for (int i = 0; i < ecbArray.length; i++) {\r
ECB ecBlock = ecbArray[i];\r
- total += ecBlock.count * (ecBlock.dataCodewords + ecCodewords);\r
+ total += ecBlock.getCount() * (ecBlock.getDataCodewords() + ecCodewords);\r
}\r
this.totalCodewords = total;\r
}\r
* will be the same across all blocks within one version.</p>\r
*/\r
static final class ECBlocks {\r
- private int ecCodewords;\r
- private ECB[] ecBlocks;\r
+ private final int ecCodewords;\r
+ private final ECB[] ecBlocks;\r
\r
private ECBlocks(int ecCodewords, ECB ecBlocks) {\r
this.ecCodewords = ecCodewords;\r
* parameters is used consecutively in the QR code version's format.</p>\r
*/\r
static final class ECB {\r
- private int count;\r
- private int dataCodewords;\r
+ final int count;\r
+ final int dataCodewords;\r
\r
- private ECB(int count, int dataCodewords) {\r
+ ECB(int count, int dataCodewords) {\r
this.count = count;\r
this.dataCodewords = dataCodewords;\r
}\r
new ECBlocks(30, new ECB(30, 16),\r
new ECB(2, 17))),\r
new Version(25, new int[]{6, 32, 58, 84, 110},\r
- new ECBlocks(26, new ECB(8, 1061),\r
+ new ECBlocks(26, new ECB(8, 106),\r
new ECB(4, 107)),\r
new ECBlocks(28, new ECB(8, 47),\r
new ECB(13, 48)),\r