diff --git a/core/test/data/blackbox/ean13-2/01.png b/core/test/data/blackbox/ean13-2/01.png new file mode 100755 index 000000000..465e2f2a6 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/01.png differ diff --git a/core/test/data/blackbox/ean13-2/01.txt b/core/test/data/blackbox/ean13-2/01.txt new file mode 100644 index 000000000..a98aacb6c --- /dev/null +++ b/core/test/data/blackbox/ean13-2/01.txt @@ -0,0 +1 @@ +9780804816632 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/02.png b/core/test/data/blackbox/ean13-2/02.png new file mode 100755 index 000000000..b99685633 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/02.png differ diff --git a/core/test/data/blackbox/ean13-2/02.txt b/core/test/data/blackbox/ean13-2/02.txt new file mode 100644 index 000000000..a98aacb6c --- /dev/null +++ b/core/test/data/blackbox/ean13-2/02.txt @@ -0,0 +1 @@ +9780804816632 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/03.png b/core/test/data/blackbox/ean13-2/03.png new file mode 100755 index 000000000..b514c62a1 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/03.png differ diff --git a/core/test/data/blackbox/ean13-2/03.txt b/core/test/data/blackbox/ean13-2/03.txt new file mode 100644 index 000000000..a98aacb6c --- /dev/null +++ b/core/test/data/blackbox/ean13-2/03.txt @@ -0,0 +1 @@ +9780804816632 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/04.png b/core/test/data/blackbox/ean13-2/04.png new file mode 100755 index 000000000..b47daef57 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/04.png differ diff --git a/core/test/data/blackbox/ean13-2/04.txt b/core/test/data/blackbox/ean13-2/04.txt new file mode 100644 index 000000000..a98aacb6c --- /dev/null +++ b/core/test/data/blackbox/ean13-2/04.txt @@ -0,0 +1 @@ +9780804816632 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/05.png b/core/test/data/blackbox/ean13-2/05.png new file mode 100755 index 000000000..bb0fc8dd2 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/05.png differ diff --git a/core/test/data/blackbox/ean13-2/05.txt b/core/test/data/blackbox/ean13-2/05.txt new file mode 100644 index 000000000..a98aacb6c --- /dev/null +++ b/core/test/data/blackbox/ean13-2/05.txt @@ -0,0 +1 @@ +9780804816632 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/06.png b/core/test/data/blackbox/ean13-2/06.png new file mode 100755 index 000000000..a70af31ba Binary files /dev/null and b/core/test/data/blackbox/ean13-2/06.png differ diff --git a/core/test/data/blackbox/ean13-2/06.txt b/core/test/data/blackbox/ean13-2/06.txt new file mode 100644 index 000000000..a98aacb6c --- /dev/null +++ b/core/test/data/blackbox/ean13-2/06.txt @@ -0,0 +1 @@ +9780804816632 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/07.png b/core/test/data/blackbox/ean13-2/07.png new file mode 100755 index 000000000..d5c7646df Binary files /dev/null and b/core/test/data/blackbox/ean13-2/07.png differ diff --git a/core/test/data/blackbox/ean13-2/07.txt b/core/test/data/blackbox/ean13-2/07.txt new file mode 100644 index 000000000..a98aacb6c --- /dev/null +++ b/core/test/data/blackbox/ean13-2/07.txt @@ -0,0 +1 @@ +9780804816632 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/08.png b/core/test/data/blackbox/ean13-2/08.png new file mode 100755 index 000000000..09b2aa150 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/08.png differ diff --git a/core/test/data/blackbox/ean13-2/08.txt b/core/test/data/blackbox/ean13-2/08.txt new file mode 100644 index 000000000..8dab35e14 --- /dev/null +++ b/core/test/data/blackbox/ean13-2/08.txt @@ -0,0 +1 @@ +9780345348036 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/09.png b/core/test/data/blackbox/ean13-2/09.png new file mode 100755 index 000000000..3251ff600 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/09.png differ diff --git a/core/test/data/blackbox/ean13-2/09.txt b/core/test/data/blackbox/ean13-2/09.txt new file mode 100644 index 000000000..8dab35e14 --- /dev/null +++ b/core/test/data/blackbox/ean13-2/09.txt @@ -0,0 +1 @@ +9780345348036 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/10.png b/core/test/data/blackbox/ean13-2/10.png new file mode 100755 index 000000000..8e5baf12d Binary files /dev/null and b/core/test/data/blackbox/ean13-2/10.png differ diff --git a/core/test/data/blackbox/ean13-2/10.txt b/core/test/data/blackbox/ean13-2/10.txt new file mode 100644 index 000000000..8dab35e14 --- /dev/null +++ b/core/test/data/blackbox/ean13-2/10.txt @@ -0,0 +1 @@ +9780345348036 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/11.png b/core/test/data/blackbox/ean13-2/11.png new file mode 100755 index 000000000..92e91a505 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/11.png differ diff --git a/core/test/data/blackbox/ean13-2/11.txt b/core/test/data/blackbox/ean13-2/11.txt new file mode 100644 index 000000000..8dab35e14 --- /dev/null +++ b/core/test/data/blackbox/ean13-2/11.txt @@ -0,0 +1 @@ +9780345348036 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/12.png b/core/test/data/blackbox/ean13-2/12.png new file mode 100755 index 000000000..8a659f3a2 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/12.png differ diff --git a/core/test/data/blackbox/ean13-2/12.txt b/core/test/data/blackbox/ean13-2/12.txt new file mode 100644 index 000000000..8dab35e14 --- /dev/null +++ b/core/test/data/blackbox/ean13-2/12.txt @@ -0,0 +1 @@ +9780345348036 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/13.png b/core/test/data/blackbox/ean13-2/13.png new file mode 100755 index 000000000..e24e75c91 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/13.png differ diff --git a/core/test/data/blackbox/ean13-2/13.txt b/core/test/data/blackbox/ean13-2/13.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/13.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/14.png b/core/test/data/blackbox/ean13-2/14.png new file mode 100755 index 000000000..b816d7ada Binary files /dev/null and b/core/test/data/blackbox/ean13-2/14.png differ diff --git a/core/test/data/blackbox/ean13-2/14.txt b/core/test/data/blackbox/ean13-2/14.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/14.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/15.png b/core/test/data/blackbox/ean13-2/15.png new file mode 100755 index 000000000..a2d484152 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/15.png differ diff --git a/core/test/data/blackbox/ean13-2/15.txt b/core/test/data/blackbox/ean13-2/15.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/15.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/16.png b/core/test/data/blackbox/ean13-2/16.png new file mode 100755 index 000000000..d93b5ec60 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/16.png differ diff --git a/core/test/data/blackbox/ean13-2/16.txt b/core/test/data/blackbox/ean13-2/16.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/16.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/17.png b/core/test/data/blackbox/ean13-2/17.png new file mode 100755 index 000000000..d852b1339 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/17.png differ diff --git a/core/test/data/blackbox/ean13-2/17.txt b/core/test/data/blackbox/ean13-2/17.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/17.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/18.png b/core/test/data/blackbox/ean13-2/18.png new file mode 100755 index 000000000..8ca5bb2e7 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/18.png differ diff --git a/core/test/data/blackbox/ean13-2/18.txt b/core/test/data/blackbox/ean13-2/18.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/18.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/19.png b/core/test/data/blackbox/ean13-2/19.png new file mode 100755 index 000000000..9b4b0d816 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/19.png differ diff --git a/core/test/data/blackbox/ean13-2/19.txt b/core/test/data/blackbox/ean13-2/19.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/19.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/20.png b/core/test/data/blackbox/ean13-2/20.png new file mode 100755 index 000000000..30f2eec74 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/20.png differ diff --git a/core/test/data/blackbox/ean13-2/20.txt b/core/test/data/blackbox/ean13-2/20.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/20.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/21.png b/core/test/data/blackbox/ean13-2/21.png new file mode 100755 index 000000000..0a11ab62e Binary files /dev/null and b/core/test/data/blackbox/ean13-2/21.png differ diff --git a/core/test/data/blackbox/ean13-2/21.txt b/core/test/data/blackbox/ean13-2/21.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/21.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/22.png b/core/test/data/blackbox/ean13-2/22.png new file mode 100755 index 000000000..4fbbd54e0 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/22.png differ diff --git a/core/test/data/blackbox/ean13-2/22.txt b/core/test/data/blackbox/ean13-2/22.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/22.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/23.png b/core/test/data/blackbox/ean13-2/23.png new file mode 100755 index 000000000..f5820ac90 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/23.png differ diff --git a/core/test/data/blackbox/ean13-2/23.txt b/core/test/data/blackbox/ean13-2/23.txt new file mode 100644 index 000000000..764ab8514 --- /dev/null +++ b/core/test/data/blackbox/ean13-2/23.txt @@ -0,0 +1 @@ +1920081045006 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/24.png b/core/test/data/blackbox/ean13-2/24.png new file mode 100755 index 000000000..c23151661 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/24.png differ diff --git a/core/test/data/blackbox/ean13-2/24.txt b/core/test/data/blackbox/ean13-2/24.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/24.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/25.png b/core/test/data/blackbox/ean13-2/25.png new file mode 100755 index 000000000..8323733d2 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/25.png differ diff --git a/core/test/data/blackbox/ean13-2/25.txt b/core/test/data/blackbox/ean13-2/25.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/25.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/26.png b/core/test/data/blackbox/ean13-2/26.png new file mode 100755 index 000000000..b773cc70a Binary files /dev/null and b/core/test/data/blackbox/ean13-2/26.png differ diff --git a/core/test/data/blackbox/ean13-2/26.txt b/core/test/data/blackbox/ean13-2/26.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/26.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/27.png b/core/test/data/blackbox/ean13-2/27.png new file mode 100755 index 000000000..a19d3da4e Binary files /dev/null and b/core/test/data/blackbox/ean13-2/27.png differ diff --git a/core/test/data/blackbox/ean13-2/27.txt b/core/test/data/blackbox/ean13-2/27.txt new file mode 100644 index 000000000..e5bf71a1b --- /dev/null +++ b/core/test/data/blackbox/ean13-2/27.txt @@ -0,0 +1 @@ +9784872348880 \ No newline at end of file diff --git a/core/test/data/blackbox/ean13-2/28.png b/core/test/data/blackbox/ean13-2/28.png new file mode 100755 index 000000000..1d9bb2b75 Binary files /dev/null and b/core/test/data/blackbox/ean13-2/28.png differ diff --git a/core/test/data/blackbox/ean13-2/28.txt b/core/test/data/blackbox/ean13-2/28.txt new file mode 100644 index 000000000..764ab8514 --- /dev/null +++ b/core/test/data/blackbox/ean13-2/28.txt @@ -0,0 +1 @@ +1920081045006 \ No newline at end of file diff --git a/core/test/src/com/google/zxing/oned/EAN13BlackBox2TestCase.java b/core/test/src/com/google/zxing/oned/EAN13BlackBox2TestCase.java index 48d587859..b3429a91a 100644 --- a/core/test/src/com/google/zxing/oned/EAN13BlackBox2TestCase.java +++ b/core/test/src/com/google/zxing/oned/EAN13BlackBox2TestCase.java @@ -21,14 +21,16 @@ import com.google.zxing.BarcodeFormat; import com.google.zxing.common.AbstractBlackBoxTestCase; /** + * This is a set of mobile image taken at 480x360 with difficult lighting. + * * @author dswitkin@google.com (Daniel Switkin) */ public final class EAN13BlackBox2TestCase extends AbstractBlackBoxTestCase { public EAN13BlackBox2TestCase() { super("test/data/blackbox/ean13-2", new MultiFormatReader(), BarcodeFormat.EAN_13); - addTest(1, 1, 0.0f); - addTest(1, 1, 180.0f); + addTest(10, 14, 0.0f); + addTest(10, 16, 180.0f); } -} \ No newline at end of file +}