X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fandroid%2FDecodeThread.java;fp=android%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fandroid%2FDecodeThread.java;h=cd58239fbc1406386cb6e4e122a01db872cc9fc1;hb=57bb0963235815560048d9241b7a6530c1c1fbf0;hp=b383b4760024b99c0479ee43151bd5b5b9c4110b;hpb=8c91e26190f4d312f0c5d000d676efadd352ef81;p=zxing.git

diff --git a/android/src/com/google/zxing/client/android/DecodeThread.java b/android/src/com/google/zxing/client/android/DecodeThread.java
index b383b476..cd58239f 100755
--- a/android/src/com/google/zxing/client/android/DecodeThread.java
+++ b/android/src/com/google/zxing/client/android/DecodeThread.java
@@ -42,6 +42,7 @@ import java.util.Vector;
  * @author dswitkin@google.com (Daniel Switkin)
  */
 final class DecodeThread extends Thread {
+
   public static final String BARCODE_BITMAP = "barcode_bitmap";
   private static final String TAG = "DecodeThread";
 
@@ -107,7 +108,8 @@ final class DecodeThread extends Thread {
     doSetDecodeMode(BarcodeFormat.UPC_A,
                     BarcodeFormat.UPC_E,
                     BarcodeFormat.EAN_13,
-                    BarcodeFormat.EAN_8);
+                    BarcodeFormat.EAN_8,
+                    BarcodeFormat.RSS14);
   }
 
   /**
@@ -120,7 +122,8 @@ final class DecodeThread extends Thread {
                     BarcodeFormat.EAN_8,
                     BarcodeFormat.CODE_39,
                     BarcodeFormat.CODE_128,
-                    BarcodeFormat.ITF);
+                    BarcodeFormat.ITF,
+                    BarcodeFormat.RSS14);
   }
 
   private void setDecodeQRMode() {
@@ -139,6 +142,7 @@ final class DecodeThread extends Thread {
                     BarcodeFormat.CODE_39,
                     BarcodeFormat.CODE_128,
                     BarcodeFormat.ITF,
+                    BarcodeFormat.RSS14,
                     BarcodeFormat.QR_CODE);
   }
 
@@ -170,6 +174,8 @@ final class DecodeThread extends Thread {
       rawResult = multiFormatReader.decodeWithState(bitmap);
     } catch (ReaderException re) {
       // continue
+    } finally {
+      multiFormatReader.reset();
     }
 
     if (rawResult != null) {