Added 13 new blackbox images.

git-svn-id: http://zxing.googlecode.com/svn/trunk@603 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/core/test/data/blackbox/ean13-1/36.jpg b/core/test/data/blackbox/ean13-1/36.jpg
new file mode 100644 (file)
index 0000000..20fc34c
Binary files /dev/null and b/core/test/data/blackbox/ean13-1/36.jpg differ

diff --git a/core/test/data/blackbox/ean13-1/36.txt b/core/test/data/blackbox/ean13-1/36.txt
new file mode 100644 (file)
index 0000000..8860f23
--- /dev/null
+++ b/core/test/data/blackbox/ean13-1/36.txt
@@ -0,0 +1 @@
+5000213101025
\ No newline at end of file

diff --git a/core/test/data/blackbox/ean13-1/37.jpg b/core/test/data/blackbox/ean13-1/37.jpg
new file mode 100644 (file)
index 0000000..0617eae
Binary files /dev/null and b/core/test/data/blackbox/ean13-1/37.jpg differ

diff --git a/core/test/data/blackbox/ean13-1/37.txt b/core/test/data/blackbox/ean13-1/37.txt
new file mode 100644 (file)
index 0000000..645fe52
--- /dev/null
+++ b/core/test/data/blackbox/ean13-1/37.txt
@@ -0,0 +1 @@
+5000213002834
\ No newline at end of file

diff --git a/core/test/data/blackbox/ean13-1/38.jpg b/core/test/data/blackbox/ean13-1/38.jpg
new file mode 100644 (file)
index 0000000..69ae222
Binary files /dev/null and b/core/test/data/blackbox/ean13-1/38.jpg differ

diff --git a/core/test/data/blackbox/ean13-1/38.txt b/core/test/data/blackbox/ean13-1/38.txt
new file mode 100644 (file)
index 0000000..89052f6
--- /dev/null
+++ b/core/test/data/blackbox/ean13-1/38.txt
@@ -0,0 +1 @@
+9780201752847
\ No newline at end of file

diff --git a/core/test/data/blackbox/upca-4/10.jpg b/core/test/data/blackbox/upca-4/10.jpg
new file mode 100644 (file)
index 0000000..81d71cf
Binary files /dev/null and b/core/test/data/blackbox/upca-4/10.jpg differ

diff --git a/core/test/data/blackbox/upca-4/10.txt b/core/test/data/blackbox/upca-4/10.txt
new file mode 100644 (file)
index 0000000..3e76dac
--- /dev/null
+++ b/core/test/data/blackbox/upca-4/10.txt
@@ -0,0 +1 @@
+066721010995
\ No newline at end of file

diff --git a/core/test/data/blackbox/upca-4/11.jpg b/core/test/data/blackbox/upca-4/11.jpg
new file mode 100644 (file)
index 0000000..819566b
Binary files /dev/null and b/core/test/data/blackbox/upca-4/11.jpg differ

diff --git a/core/test/data/blackbox/upca-4/11.txt b/core/test/data/blackbox/upca-4/11.txt
new file mode 100644 (file)
index 0000000..cef4bfc
--- /dev/null
+++ b/core/test/data/blackbox/upca-4/11.txt
@@ -0,0 +1 @@
+059290522143
\ No newline at end of file

diff --git a/core/test/data/blackbox/upca-4/12.jpg b/core/test/data/blackbox/upca-4/12.jpg
new file mode 100644 (file)
index 0000000..c1f87b6
Binary files /dev/null and b/core/test/data/blackbox/upca-4/12.jpg differ

diff --git a/core/test/data/blackbox/upca-4/12.txt b/core/test/data/blackbox/upca-4/12.txt
new file mode 100644 (file)
index 0000000..6491be4
--- /dev/null
+++ b/core/test/data/blackbox/upca-4/12.txt
@@ -0,0 +1 @@
+057961000228
\ No newline at end of file

diff --git a/core/test/data/blackbox/upca-4/13.jpg b/core/test/data/blackbox/upca-4/13.jpg
new file mode 100644 (file)
index 0000000..a4795e3
Binary files /dev/null and b/core/test/data/blackbox/upca-4/13.jpg differ

diff --git a/core/test/data/blackbox/upca-4/13.txt b/core/test/data/blackbox/upca-4/13.txt
new file mode 100644 (file)
index 0000000..cef4bfc
--- /dev/null
+++ b/core/test/data/blackbox/upca-4/13.txt
@@ -0,0 +1 @@
+059290522143
\ No newline at end of file

diff --git a/core/test/data/blackbox/upca-4/14.jpg b/core/test/data/blackbox/upca-4/14.jpg
new file mode 100644 (file)
index 0000000..0b1a677
Binary files /dev/null and b/core/test/data/blackbox/upca-4/14.jpg differ

diff --git a/core/test/data/blackbox/upca-4/14.txt b/core/test/data/blackbox/upca-4/14.txt
new file mode 100644 (file)
index 0000000..14eb468
--- /dev/null
+++ b/core/test/data/blackbox/upca-4/14.txt
@@ -0,0 +1 @@
+066721017185
\ No newline at end of file

diff --git a/core/test/data/blackbox/upca-4/15.jpg b/core/test/data/blackbox/upca-4/15.jpg
new file mode 100644 (file)
index 0000000..aeb1c1a
Binary files /dev/null and b/core/test/data/blackbox/upca-4/15.jpg differ

diff --git a/core/test/data/blackbox/upca-4/15.txt b/core/test/data/blackbox/upca-4/15.txt
new file mode 100644 (file)
index 0000000..8d6fe86
--- /dev/null
+++ b/core/test/data/blackbox/upca-4/15.txt
@@ -0,0 +1 @@
+059290571110
\ No newline at end of file

diff --git a/core/test/data/blackbox/upca-4/16.jpg b/core/test/data/blackbox/upca-4/16.jpg
new file mode 100644 (file)
index 0000000..0413408
Binary files /dev/null and b/core/test/data/blackbox/upca-4/16.jpg differ

diff --git a/core/test/data/blackbox/upca-4/16.txt b/core/test/data/blackbox/upca-4/16.txt
new file mode 100644 (file)
index 0000000..969c6d4
--- /dev/null
+++ b/core/test/data/blackbox/upca-4/16.txt
@@ -0,0 +1 @@
+067932000263
\ No newline at end of file

diff --git a/core/test/data/blackbox/upca-4/17.jpg b/core/test/data/blackbox/upca-4/17.jpg
new file mode 100644 (file)
index 0000000..c25024a
Binary files /dev/null and b/core/test/data/blackbox/upca-4/17.jpg differ

diff --git a/core/test/data/blackbox/upca-4/17.txt b/core/test/data/blackbox/upca-4/17.txt
new file mode 100644 (file)
index 0000000..52692d4
--- /dev/null
+++ b/core/test/data/blackbox/upca-4/17.txt
@@ -0,0 +1 @@
+069000061015
\ No newline at end of file

diff --git a/core/test/data/blackbox/upca-4/18.jpg b/core/test/data/blackbox/upca-4/18.jpg
new file mode 100644 (file)
index 0000000..2be51e0
Binary files /dev/null and b/core/test/data/blackbox/upca-4/18.jpg differ

diff --git a/core/test/data/blackbox/upca-4/18.txt b/core/test/data/blackbox/upca-4/18.txt
new file mode 100644 (file)
index 0000000..3445d0e
--- /dev/null
+++ b/core/test/data/blackbox/upca-4/18.txt
@@ -0,0 +1 @@
+071691155775
\ No newline at end of file

diff --git a/core/test/data/blackbox/upca-4/19.jpg b/core/test/data/blackbox/upca-4/19.jpg
new file mode 100644 (file)
index 0000000..0d467be
Binary files /dev/null and b/core/test/data/blackbox/upca-4/19.jpg differ

diff --git a/core/test/data/blackbox/upca-4/19.txt b/core/test/data/blackbox/upca-4/19.txt
new file mode 100644 (file)
index 0000000..b3b9f9c
--- /dev/null
+++ b/core/test/data/blackbox/upca-4/19.txt
@@ -0,0 +1 @@
+807648011401
\ No newline at end of file

diff --git a/core/test/src/com/google/zxing/oned/EAN13BlackBox1TestCase.java b/core/test/src/com/google/zxing/oned/EAN13BlackBox1TestCase.java
index f19ecfd..8bde030 100644 (file)
--- a/core/test/src/com/google/zxing/oned/EAN13BlackBox1TestCase.java
+++ b/core/test/src/com/google/zxing/oned/EAN13BlackBox1TestCase.java
@@ -29,8 +29,8 @@ public final class EAN13BlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public EAN13BlackBox1TestCase() {
     super(new File("test/data/blackbox/ean13-1"), new MultiFormatReader(), BarcodeFormat.EAN_13);
-    addTest(27, 29, 0.0f);
-    addTest(25, 29, 180.0f);
+    addTest(28, 31, 0.0f);
+    addTest(26, 31, 180.0f);
   }
 
 }
\ No newline at end of file

diff --git a/core/test/src/com/google/zxing/oned/UPCABlackBox4TestCase.java b/core/test/src/com/google/zxing/oned/UPCABlackBox4TestCase.java
index 58a31ed..699e02a 100644 (file)
--- a/core/test/src/com/google/zxing/oned/UPCABlackBox4TestCase.java
+++ b/core/test/src/com/google/zxing/oned/UPCABlackBox4TestCase.java
@@ -29,8 +29,8 @@ public final class UPCABlackBox4TestCase extends AbstractBlackBoxTestCase {
 
   public UPCABlackBox4TestCase() {
     super(new File("test/data/blackbox/upca-4"), new MultiFormatReader(), BarcodeFormat.UPC_A);
-    addTest(1, 2, 0.0f);
-    addTest(1, 2, 180.0f);
+    addTest(8, 10, 0.0f);
+    addTest(7, 12, 180.0f);
   }
 
 }