projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue 495: Renamed DATAMATRIX to DATA_MATRIX for consistency.
[zxing.git]
/
core
/
src
/
com
/
google
/
zxing
/
BarcodeFormat.java
diff --git
a/core/src/com/google/zxing/BarcodeFormat.java
b/core/src/com/google/zxing/BarcodeFormat.java
index
d4e1e70
..
73e3cd0
100644
(file)
--- a/
core/src/com/google/zxing/BarcodeFormat.java
+++ b/
core/src/com/google/zxing/BarcodeFormat.java
@@
-33,7
+33,7
@@
public final class BarcodeFormat {
public static final BarcodeFormat QR_CODE = new BarcodeFormat("QR_CODE");
/** DataMatrix 2D barcode format. */
public static final BarcodeFormat QR_CODE = new BarcodeFormat("QR_CODE");
/** DataMatrix 2D barcode format. */
- public static final BarcodeFormat DATA
MATRIX = new BarcodeFormat("DATA
MATRIX");
+ public static final BarcodeFormat DATA
_MATRIX = new BarcodeFormat("DATA_
MATRIX");
/** UPC-E 1D format. */
public static final BarcodeFormat UPC_E = new BarcodeFormat("UPC_E");
/** UPC-E 1D format. */
public static final BarcodeFormat UPC_E = new BarcodeFormat("UPC_E");
@@
-47,12
+47,21
@@
public final class BarcodeFormat {
/** EAN-13 1D format. */
public static final BarcodeFormat EAN_13 = new BarcodeFormat("EAN_13");
/** EAN-13 1D format. */
public static final BarcodeFormat EAN_13 = new BarcodeFormat("EAN_13");
+ /** UPC/EAN extension format. Not a stand-alone format. */
+ public static final BarcodeFormat UPC_EAN_EXTENSION = new BarcodeFormat("UPC_EAN_EXTENSION");
+
/** Code 128 1D format. */
public static final BarcodeFormat CODE_128 = new BarcodeFormat("CODE_128");
/** Code 39 1D format. */
public static final BarcodeFormat CODE_39 = new BarcodeFormat("CODE_39");
/** Code 128 1D format. */
public static final BarcodeFormat CODE_128 = new BarcodeFormat("CODE_128");
/** Code 39 1D format. */
public static final BarcodeFormat CODE_39 = new BarcodeFormat("CODE_39");
+ /** Code 93 1D format. */
+ public static final BarcodeFormat CODE_93 = new BarcodeFormat("CODE_93");
+
+ /** CODABAR 1D format. */
+ public static final BarcodeFormat CODABAR = new BarcodeFormat("CODABAR");
+
/** ITF (Interleaved Two of Five) 1D format. */
public static final BarcodeFormat ITF = new BarcodeFormat("ITF");
/** ITF (Interleaved Two of Five) 1D format. */
public static final BarcodeFormat ITF = new BarcodeFormat("ITF");
@@
-61,7
+70,7
@@
public final class BarcodeFormat {
/** PDF417 format. */
public static final BarcodeFormat PDF417 = new BarcodeFormat("PDF417");
/** PDF417 format. */
public static final BarcodeFormat PDF417 = new BarcodeFormat("PDF417");
-
+
/** RSS EXPANDED */
public static final BarcodeFormat RSS_EXPANDED = new BarcodeFormat("RSS_EXPANDED");
/** RSS EXPANDED */
public static final BarcodeFormat RSS_EXPANDED = new BarcodeFormat("RSS_EXPANDED");