/*\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
import com.google.zxing.ReaderException;\r
import com.google.zxing.common.BitMatrix;\r
+import com.google.zxing.common.DecoderResult;\r
import com.google.zxing.common.reedsolomon.GF256;\r
import com.google.zxing.common.reedsolomon.ReedSolomonDecoder;\r
import com.google.zxing.common.reedsolomon.ReedSolomonException;\r
* <p>The main class which implements QR Code decoding -- as opposed to locating and extracting\r
* the QR Code from an image.</p>\r
*\r
- * @author srowen@google.com (Sean Owen)\r
+ * @author Sean Owen\r
*/\r
public final class Decoder {\r
\r
* "true" is taken to mean a black module.</p>\r
*\r
* @param image booleans representing white/black QR Code modules\r
- * @return text encoded within the QR Code\r
+ * @return text and bytes encoded within the QR Code\r
* @throws ReaderException if the QR Code cannot be decoded\r
*/\r
- public String decode(boolean[][] image) throws ReaderException {\r
+ public DecoderResult decode(boolean[][] image) throws ReaderException {\r
int dimension = image.length;\r
BitMatrix bits = new BitMatrix(dimension);\r
for (int i = 0; i < dimension; i++) {\r
for (int j = 0; j < dimension; j++) {\r
if (image[i][j]) {\r
- bits.set(i, j);\r
+ bits.set(j, i);\r
}\r
}\r
}\r
* <p>Decodes a QR Code represented as a {@link BitMatrix}. A 1 or "true" is taken to mean a black module.</p>\r
*\r
* @param bits booleans representing white/black QR Code modules\r
- * @return text encoded within the QR Code\r
+ * @return text and bytes encoded within the QR Code\r
* @throws ReaderException if the QR Code cannot be decoded\r
*/\r
- public String decode(BitMatrix bits) throws ReaderException {\r
+ public DecoderResult decode(BitMatrix bits) throws ReaderException {\r
\r
// Construct a parser and read version, error-correction level\r
BitMatrixParser parser = new BitMatrixParser(bits);\r
}\r
\r
// Decode the contents of that stream of bytes\r
- return DecodedBitStreamParser.decode(resultBytes, version);\r
+ return DecodedBitStreamParser.decode(resultBytes, version, ecLevel);\r
}\r
\r
/**\r
try {\r
rsDecoder.decode(codewordsInts, numECCodewords);\r
} catch (ReedSolomonException rse) {\r
- throw new ReaderException(rse.toString());\r
+ throw ReaderException.getInstance();\r
}\r
// Copy back into array of bytes -- only need to worry about the bytes that were data\r
// We don't care about errors in the error-correction codewords\r