X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2FBarcodeFormat.java;h=73e3cd0711e0667a5b451d27b60e4f21032551c1;hb=18e3e8522fb403891dc211e6de9681dcf1030b66;hp=032a1b64578f1d7ea66a18136c8cff8097e08bf0;hpb=521744103d4308512ffba37a62fa37ae2e1bc493;p=zxing.git

diff --git a/core/src/com/google/zxing/BarcodeFormat.java b/core/src/com/google/zxing/BarcodeFormat.java
index 032a1b64..73e3cd07 100644
--- 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 DATAMATRIX = new BarcodeFormat("DATAMATRIX");
+  public static final BarcodeFormat DATA_MATRIX = new BarcodeFormat("DATA_MATRIX");
 
   /** UPC-E 1D format. */
   public static final BarcodeFormat UPC_E = new BarcodeFormat("UPC_E");
@@ -47,6 +47,9 @@ public final class BarcodeFormat {
   /** 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");
 
@@ -54,9 +57,9 @@ public final class BarcodeFormat {
   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 CODE_93 = new BarcodeFormat("CODE_93");
+
+  /** CODABAR 1D format. */
   public static final BarcodeFormat CODABAR = new BarcodeFormat("CODABAR");
 
   /** ITF (Interleaved Two of Five) 1D format. */
@@ -67,7 +70,7 @@ public final class BarcodeFormat {
 
   /** PDF417 format. */
   public static final BarcodeFormat PDF417 = new BarcodeFormat("PDF417");
-  
+
   /** RSS EXPANDED */
   public static final BarcodeFormat RSS_EXPANDED = new BarcodeFormat("RSS_EXPANDED");