update

cping · Jul 24, 2015 · 51c1f2b · 51c1f2b
1 parent aee4b47
commit 51c1f2b
Show file tree

Hide file tree

Showing 40 changed files with 1,071 additions and 3,335 deletions.
diff --git a/demo/demo.jar b/demo/demo.jar
diff --git a/eclipse/src/com/google/zxing/BarcodeFormat.java b/eclipse/src/com/google/zxing/BarcodeFormat.java
@@ -23,9 +23,6 @@
  */
 public enum BarcodeFormat {
 
-	/** Aztec 2D barcode format. */
-	AZTEC,
-
 	/** CODABAR 1D format. */
 	CODABAR,
 

diff --git a/eclipse/src/com/google/zxing/MultiFormatReader.java b/eclipse/src/com/google/zxing/MultiFormatReader.java
@@ -16,7 +16,6 @@
 
 package com.google.zxing;
 
-import com.google.zxing.aztec.AztecReader;
 import com.google.zxing.datamatrix.DataMatrixReader;
 import com.google.zxing.maxicode.MaxiCodeReader;
 import com.google.zxing.oned.MultiFormatOneDReader;
@@ -136,9 +135,6 @@ public void setHints(Map<DecodeHintType, ?> hints) {
 			if (formats.contains(BarcodeFormat.DATA_MATRIX)) {
 				readers.add(new DataMatrixReader());
 			}
-			if (formats.contains(BarcodeFormat.AZTEC)) {
-				readers.add(new AztecReader());
-			}
 			if (formats.contains(BarcodeFormat.MAXICODE)) {
 				readers.add(new MaxiCodeReader());
 			}
@@ -154,7 +150,6 @@ public void setHints(Map<DecodeHintType, ?> hints) {
 
 			readers.add(new QRCodeReader());
 			readers.add(new DataMatrixReader());
-			readers.add(new AztecReader());
 			readers.add(new MaxiCodeReader());
 
 			if (tryHarder) {

diff --git a/eclipse/src/com/google/zxing/MultiFormatWriter.java b/eclipse/src/com/google/zxing/MultiFormatWriter.java
@@ -16,7 +16,6 @@
 
 package com.google.zxing;
 
-import com.google.zxing.aztec.AztecWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.datamatrix.DataMatrixWriter;
 import com.google.zxing.oned.CodaBarWriter;
@@ -77,9 +76,6 @@ public BitMatrix encode(String contents, BarcodeFormat format, int width,
 		case DATA_MATRIX:
 			writer = new DataMatrixWriter();
 			break;
-		case AZTEC:
-			writer = new AztecWriter();
-			break;
 		default:
 			throw new IllegalArgumentException(
 					"No encoder available for format " + format);

diff --git a/eclipse/src/com/google/zxing/aztec/AztecDetectorResult.java b/eclipse/src/com/google/zxing/aztec/AztecDetectorResult.java
diff --git a/eclipse/src/com/google/zxing/aztec/AztecReader.java b/eclipse/src/com/google/zxing/aztec/AztecReader.java
diff --git a/eclipse/src/com/google/zxing/aztec/AztecWriter.java b/eclipse/src/com/google/zxing/aztec/AztecWriter.java