From b4dbafd45e7e994bc4da2e2a95562d83262c6208 Mon Sep 17 00:00:00 2001 From: srowen Date: Sun, 21 Mar 2010 13:49:49 +0000 Subject: [PATCH] Another change for Issue 112 git-svn-id: http://zxing.googlecode.com/svn/trunk@1249 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../src/com/google/zxing/client/android/CaptureActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java index f00aa85f..2d9b014e 100755 --- a/android/src/com/google/zxing/client/android/CaptureActivity.java +++ b/android/src/com/google/zxing/client/android/CaptureActivity.java @@ -107,7 +107,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal PRODUCT_FORMATS.add(BarcodeFormat.UPC_E); PRODUCT_FORMATS.add(BarcodeFormat.EAN_13); PRODUCT_FORMATS.add(BarcodeFormat.EAN_8); - //PRODUCT_FORMATS.add(BarcodeFormat.RSS14); + PRODUCT_FORMATS.add(BarcodeFormat.RSS14); ONE_D_FORMATS = new Vector(PRODUCT_FORMATS.size() + 3); ONE_D_FORMATS.addAll(PRODUCT_FORMATS); ONE_D_FORMATS.add(BarcodeFormat.CODE_39); @@ -255,6 +255,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal for (String format : COMMA_PATTERN.split(scanFormats)) { formats.add(BarcodeFormat.valueOf(format)); } + return formats; } catch (IllegalArgumentException iae) { // ignore it then } -- 2.20.1