small typo fix.

[zxing.git] / core / src / com / google / zxing / oned / Code39Reader.java

diff --git a/core/src/com/google/zxing/oned/Code39Reader.java b/core/src/com/google/zxing/oned/Code39Reader.java
index e73ccf0..2811312 100644 (file)
--- a/core/src/com/google/zxing/oned/Code39Reader.java
+++ b/core/src/com/google/zxing/oned/Code39Reader.java
@@ -16,12 +16,15 @@
 
 package com.google.zxing.oned;
 
+import com.google.zxing.BarcodeFormat;
 import com.google.zxing.ReaderException;
 import com.google.zxing.Result;
 import com.google.zxing.ResultPoint;
 import com.google.zxing.common.BitArray;
 import com.google.zxing.common.GenericResultPoint;
 
+import java.util.Hashtable;
+
 /**
  * <p>Decodes Code 39 barcodes. This does not supported "Full ASCII Code 39" yet.</p>
  *
@@ -38,9 +41,9 @@ public final class Code39Reader extends AbstractOneDReader {
    * with 1s representing "wide" and 0s representing narrow.
    */
   private static final int[] CHARACTER_ENCODINGS = {
-      0x038, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, // 0-9
+      0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, // 0-9
       0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C, 0x04C, 0x01C, // A-J
-      0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007, 0x106, 0x046, 0x016,  // K-T
+      0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007, 0x106, 0x046, 0x016, // K-T
       0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0, 0x085, 0x184, 0x0C4, 0x094, // U-*
       0x0A8, 0x0A2, 0x08A, 0x02A // $-%
   };
@@ -64,7 +67,7 @@ public final class Code39Reader extends AbstractOneDReader {
    * It will not decoded "extended Code 39" sequences.
    *
    * @param usingCheckDigit if true, treat the last data character as a check digit, not
-   * data, and verify that the checksum passes
+   * data, and verify that the checksum passes.
    */
   public Code39Reader(boolean usingCheckDigit) {
     this.usingCheckDigit = usingCheckDigit;
@@ -77,16 +80,16 @@ public final class Code39Reader extends AbstractOneDReader {
    * the full ASCII character set.
    *
    * @param usingCheckDigit if true, treat the last data character as a check digit, not
-   * data, and verify that the checksum passes
-   * @param extendedMode if true, willa tetmpt to decode extended Code 39 sequences in the
-   * text
+   * data, and verify that the checksum passes.
+   * @param extendedMode if true, will attempt to decode extended Code 39 sequences in the
+   * text.
    */
   public Code39Reader(boolean usingCheckDigit, boolean extendedMode) {
     this.usingCheckDigit = usingCheckDigit;
     this.extendedMode = extendedMode;
   }
 
-  public Result decodeRow(final int rowNumber, final BitArray row) throws ReaderException {
+  public Result decodeRow(int rowNumber, BitArray row, Hashtable hints) throws ReaderException {
 
     int[] start = findAsteriskPattern(row);
 
@@ -135,9 +138,15 @@ public final class Code39Reader extends AbstractOneDReader {
     if (extendedMode) {
       resultString = decodeExtended(resultString);
     }
-    return new Result(resultString,
-        new ResultPoint[]{new GenericResultPoint((float) (start[1] - start[0]) / 2.0f, (float) rowNumber),
-            new GenericResultPoint((float) (nextStart - lastStart) / 2.0f, (float) rowNumber)});
+    float left = (float) (start[1] + start[0]) / 2.0f;
+    float right = (float) (nextStart + lastStart) / 2.0f;
+    return new Result(
+        resultString,
+        null,
+        new ResultPoint[]{
+            new GenericResultPoint(left, (float) rowNumber),
+            new GenericResultPoint(right, (float) rowNumber)},
+        BarcodeFormat.CODE_39);
 
   }
 
@@ -174,6 +183,8 @@ public final class Code39Reader extends AbstractOneDReader {
           for (int y = 2; y < patternLength; y++) {
             counters[y - 2] = counters[y];
           }
+          counters[patternLength - 2] = 0;
+          counters[patternLength - 1] = 0;
           counterPosition--;
         } else {
           counterPosition++;
@@ -186,25 +197,31 @@ public final class Code39Reader extends AbstractOneDReader {
   }
 
   private static int toNarrowWidePattern(int[] counters) throws ReaderException {
-    int minCounter = Integer.MAX_VALUE;
-    for (int i = 0; i < counters.length; i++) {
-      if (counters[i] < minCounter) {
-        minCounter = counters[i];
+    int numCounters = counters.length;
+    int maxNarrowCounter = 0;
+    int wideCounters;
+    do {
+      int minCounter = Integer.MAX_VALUE;
+      for (int i = 0; i < numCounters; i++) {
+        int counter = counters[i];
+        if (counter < minCounter && counter > maxNarrowCounter) {
+          minCounter = counter;
+        }
       }
-    }
-    int maxNarrowCounter = (int) (minCounter * 1.5f);
-    int wideCounters = 0;
-    int pattern = 0;
-    for (int i = 0; i < counters.length; i++) {
-      if (counters[i] > maxNarrowCounter) {
-        pattern |= 1 << (counters.length - 1 - i);
-        wideCounters++;
+      maxNarrowCounter = minCounter;
+      wideCounters = 0;
+      int pattern = 0;
+      for (int i = 0; i < numCounters; i++) {
+        if (counters[i] > maxNarrowCounter) {
+          pattern |= 1 << (numCounters - 1 - i);
+          wideCounters++;
+        }
       }
-    }
-    if (wideCounters != 3) {
-      throw new ReaderException("Can't find 3 wide bars/spaces out of 9");
-    }
-    return pattern;
+      if (wideCounters == 3) {
+        return pattern;
+      }
+    } while (wideCounters > 3);
+    throw new ReaderException("Can't find 3 wide bars/spaces out of 9");
   }
 
   private static char patternToChar(int pattern) throws ReaderException {
@@ -272,4 +289,4 @@ public final class Code39Reader extends AbstractOneDReader {
     return decoded.toString();
   }
 
-}
\ No newline at end of file
+}