projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move to singleton ReaderException for a bit more performance
[zxing.git]
/
core
/
src
/
com
/
google
/
zxing
/
oned
/
UPCEReader.java
diff --git
a/core/src/com/google/zxing/oned/UPCEReader.java
b/core/src/com/google/zxing/oned/UPCEReader.java
index
2b68977
..
f8b885a
100644
(file)
--- a/
core/src/com/google/zxing/oned/UPCEReader.java
+++ b/
core/src/com/google/zxing/oned/UPCEReader.java
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2008
Google Inc.
+ * Copyright 2008
ZXing authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-26,7
+26,7
@@
import com.google.zxing.common.BitArray;
* <p><a href="http://www.barcodeisland.com/upce.phtml">This</a> is a great reference for
* UPC-E information.</p>
*
* <p><a href="http://www.barcodeisland.com/upce.phtml">This</a> is a great reference for
* UPC-E information.</p>
*
- * @author
srowen@google.com (Sean Owen)
+ * @author
Sean Owen
*/
public final class UPCEReader extends AbstractUPCEANReader {
*/
public final class UPCEReader extends AbstractUPCEANReader {
@@
-46,9
+46,18
@@
public final class UPCEReader extends AbstractUPCEANReader {
{0x07, 0x0B, 0x0D, 0x0E, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A}
};
{0x07, 0x0B, 0x0D, 0x0E, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A}
};
- protected int decodeMiddle(BitArray row, int[] startRange, StringBuffer result) throws ReaderException {
+ private final int[] decodeMiddleCounters;
+
+ public UPCEReader() {
+ decodeMiddleCounters = new int[4];
+ }
- int[] counters = new int[4];
+ protected int decodeMiddle(BitArray row, int[] startRange, StringBuffer result) throws ReaderException {
+ int[] counters = decodeMiddleCounters;
+ counters[0] = 0;
+ counters[1] = 0;
+ counters[2] = 0;
+ counters[3] = 0;
int end = row.getSize();
int rowOffset = startRange[1];
int end = row.getSize();
int rowOffset = startRange[1];
@@
-90,7
+99,7
@@
public final class UPCEReader extends AbstractUPCEANReader {
}
}
}
}
}
}
- throw
new ReaderException("Unable to determine number system and check digit"
);
+ throw
ReaderException.getInstance(
);
}
BarcodeFormat getBarcodeFormat() {
}
BarcodeFormat getBarcodeFormat() {
@@
-103,7
+112,7
@@
public final class UPCEReader extends AbstractUPCEANReader {
* @param upce UPC-E code as string of digits
* @return equivalent UPC-A code as string of digits
*/
* @param upce UPC-E code as string of digits
* @return equivalent UPC-A code as string of digits
*/
- p
rivate
static String convertUPCEtoUPCA(String upce) {
+ p
ublic
static String convertUPCEtoUPCA(String upce) {
char[] upceChars = new char[6];
upce.getChars(1, 7, upceChars, 0);
StringBuffer result = new StringBuffer(12);
char[] upceChars = new char[6];
upce.getChars(1, 7, upceChars, 0);
StringBuffer result = new StringBuffer(12);