mirror of
https://github.com/zxing/zxing.git
synced 2025-01-13 04:07:27 -08:00
Another change for Issue 112
git-svn-id: https://zxing.googlecode.com/svn/trunk@1249 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
parent
4b865c1339
commit
6815ab5ea1
|
@ -107,7 +107,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
|
||||||
PRODUCT_FORMATS.add(BarcodeFormat.UPC_E);
|
PRODUCT_FORMATS.add(BarcodeFormat.UPC_E);
|
||||||
PRODUCT_FORMATS.add(BarcodeFormat.EAN_13);
|
PRODUCT_FORMATS.add(BarcodeFormat.EAN_13);
|
||||||
PRODUCT_FORMATS.add(BarcodeFormat.EAN_8);
|
PRODUCT_FORMATS.add(BarcodeFormat.EAN_8);
|
||||||
//PRODUCT_FORMATS.add(BarcodeFormat.RSS14);
|
PRODUCT_FORMATS.add(BarcodeFormat.RSS14);
|
||||||
ONE_D_FORMATS = new Vector<BarcodeFormat>(PRODUCT_FORMATS.size() + 3);
|
ONE_D_FORMATS = new Vector<BarcodeFormat>(PRODUCT_FORMATS.size() + 3);
|
||||||
ONE_D_FORMATS.addAll(PRODUCT_FORMATS);
|
ONE_D_FORMATS.addAll(PRODUCT_FORMATS);
|
||||||
ONE_D_FORMATS.add(BarcodeFormat.CODE_39);
|
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)) {
|
for (String format : COMMA_PATTERN.split(scanFormats)) {
|
||||||
formats.add(BarcodeFormat.valueOf(format));
|
formats.add(BarcodeFormat.valueOf(format));
|
||||||
}
|
}
|
||||||
|
return formats;
|
||||||
} catch (IllegalArgumentException iae) {
|
} catch (IllegalArgumentException iae) {
|
||||||
// ignore it then
|
// ignore it then
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue