Tiny style bits
git-svn-id: https://zxing.googlecode.com/svn/trunk@1528 59b500cc-1b3d-0410-9834-0bbf25fbcc57
diff --git a/core/src/com/google/zxing/client/result/ExpandedProductResultParser.java b/core/src/com/google/zxing/client/result/ExpandedProductResultParser.java
index 3e3fd51..cddbda8 100644
--- a/core/src/com/google/zxing/client/result/ExpandedProductResultParser.java
+++ b/core/src/com/google/zxing/client/result/ExpandedProductResultParser.java
@@ -186,7 +186,7 @@
// We look for a new AI. If it doesn't exist (ERROR), we coninue
// with the iteration
if ("ERROR".equals(findAIvalue(index, rawTextAux))) {
- buf.append(c);
+ buf.append('(');
} else {
break;
}
diff --git a/core/src/com/google/zxing/qrcode/decoder/Decoder.java b/core/src/com/google/zxing/qrcode/decoder/Decoder.java
index f7d5273..22cdeb0 100644
--- a/core/src/com/google/zxing/qrcode/decoder/Decoder.java
+++ b/core/src/com/google/zxing/qrcode/decoder/Decoder.java
@@ -79,12 +79,10 @@
*
* @param bits booleans representing white/black QR Code modules
* @return text and bytes encoded within the QR Code
- * @throws NotFoundException if the QR Code cannot be found
* @throws FormatException if the QR Code cannot be decoded
* @throws ChecksumException if error correction fails
*/
- public DecoderResult decode(BitMatrix bits, Hashtable hints)
- throws NotFoundException, FormatException, ChecksumException {
+ public DecoderResult decode(BitMatrix bits, Hashtable hints) throws FormatException, ChecksumException {
// Construct a parser and read version, error-correction level
BitMatrixParser parser = new BitMatrixParser(bits);
diff --git a/core/src/com/google/zxing/qrcode/detector/Detector.java b/core/src/com/google/zxing/qrcode/detector/Detector.java
index b9d7f2c..c67b768 100644
--- a/core/src/com/google/zxing/qrcode/detector/Detector.java
+++ b/core/src/com/google/zxing/qrcode/detector/Detector.java
@@ -160,7 +160,7 @@
sourceBottomRightX = sourceBottomRightY = dimMinusThree;
}
- PerspectiveTransform transform = PerspectiveTransform.quadrilateralToQuadrilateral(
+ return PerspectiveTransform.quadrilateralToQuadrilateral(
3.5f,
3.5f,
dimMinusThree,
@@ -177,8 +177,6 @@
bottomRightY,
bottomLeft.getX(),
bottomLeft.getY());
-
- return transform;
}
private static BitMatrix sampleGrid(BitMatrix image,
diff --git a/core/src/com/google/zxing/qrcode/encoder/Encoder.java b/core/src/com/google/zxing/qrcode/encoder/Encoder.java
index 2217b36..a8b9dae 100644
--- a/core/src/com/google/zxing/qrcode/encoder/Encoder.java
+++ b/core/src/com/google/zxing/qrcode/encoder/Encoder.java
@@ -20,6 +20,7 @@
import com.google.zxing.WriterException;
import com.google.zxing.common.BitArray;
import com.google.zxing.common.CharacterSetECI;
+import com.google.zxing.common.ECI;
import com.google.zxing.common.reedsolomon.GF256;
import com.google.zxing.common.reedsolomon.ReedSolomonEncoder;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
@@ -547,7 +548,7 @@
}
}
- private static void appendECI(CharacterSetECI eci, BitArray bits) {
+ private static void appendECI(ECI eci, BitArray bits) {
bits.appendBits(Mode.ECI.getBits(), 4);
// This is correct for values up to 127, which is all we need now.
bits.appendBits(eci.getValue(), 8);
