From f9bf974d1c44f84a3384c19ce9e59afd00a8365d Mon Sep 17 00:00:00 2001 From: "srowen@gmail.com" Date: Fri, 31 May 2013 00:04:50 +0000 Subject: [PATCH] More improvements from fyellin git-svn-id: https://zxing.googlecode.com/svn/trunk@2813 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../google/zxing/aztec/detector/Detector.java | 7 ++++--- core/test/data/blackbox/aztec-1/hello.png | Bin 0 -> 2575 bytes core/test/data/blackbox/aztec-1/hello.txt | 1 + .../zxing/aztec/AztecBlackBox1TestCase.java | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 core/test/data/blackbox/aztec-1/hello.png create mode 100644 core/test/data/blackbox/aztec-1/hello.txt diff --git a/core/src/com/google/zxing/aztec/detector/Detector.java b/core/src/com/google/zxing/aztec/detector/Detector.java index 4464a8837..fc4403760 100644 --- a/core/src/com/google/zxing/aztec/detector/Detector.java +++ b/core/src/com/google/zxing/aztec/detector/Detector.java @@ -84,6 +84,10 @@ public final class Detector { * @throws NotFoundException in case of too many errors or invalid parameters */ private void extractParameters(ResultPoint[] bullsEyeCorners) throws NotFoundException { + if (!isValid(bullsEyeCorners[0]) || !isValid(bullsEyeCorners[1]) || + !isValid(bullsEyeCorners[2]) || !isValid(bullsEyeCorners[3])) { + throw NotFoundException.getNotFoundInstance(); + } int twoCenterLayers = 2 * nbCenterLayers; // Get the bits around the bull's eye boolean[] resab = sampleLine(bullsEyeCorners[0], bullsEyeCorners[1], twoCenterLayers+1); @@ -560,9 +564,6 @@ public final class Detector { ResultPoint result1 = new ResultPoint(centerx + ratio * dx, centery + ratio * dy); ResultPoint result3 = new ResultPoint(centerx - ratio * dx, centery - ratio * dy); - if (!isValid(result0) || !isValid(result1) || !isValid(result2) || !isValid(result3)) { - throw NotFoundException.getNotFoundInstance(); - } return new ResultPoint[] { result0, result1, result2, result3 }; } diff --git a/core/test/data/blackbox/aztec-1/hello.png b/core/test/data/blackbox/aztec-1/hello.png new file mode 100644 index 0000000000000000000000000000000000000000..c720da88ca29936933974806986d43cdd3d4ee75 GIT binary patch literal 2575 zcmV+q3h?!bP){ZCFQeT8uOTr?}XIUh7Q1d7rDK)MzyKIYBV>-PLH;Ez5HdCiDdV_}p_0rAe(YOHsqZ@u&z(57cA$ z@T=(w#>2oTkvWhjatX%@!#n$<^N^DA)iDRcf}sFPfSE0!aGm=?;jFNpAox*R`r1ka%TJ}P`N`$K?!l_xCrjCtogbVwh5Oi%DH-7^G! z+NZn8#LAOPt1D4;hkEyN>9In61;0%ZzJ zcP}Q5+JgW1uzv?@W`{mB(aMn=%xd4n-qx-qLa@bU@R;mlH!!&XcC7eWoRIK&NRIOn z#d+73e_>f}6<2ix=O+rEQK#V7I)h{RDTD+AuUEu3|I^csoiZp5!8mbpM@0A7o!ekE z$eZjblduyfZf)l6Mo+LqP3>4@W=fF{s9CF~$oLX#4JXi{C68q>I)Z%wR?rT=J?xW6 z*10)eKbQg!D-Ph+$|q?EUW(SJbI#jVHo@GG^W@ew-koXjM&}sl2qyon(VGcv)Qn+; zPidw2#%eV;glPK&nbr_YvfR3!hvUsl*-vGLofIyGBZ`gT_^V88L$D2ld<~LH|ga^!}b&5u(EJy ziw6_!kBu@MJH{{{l1^Eh-4TpPos1=cfUIi}Vg2ssN?@9AyKgXWuI%awcI3HNh9EF@ zDIpdE&RdL-OH_}uVwKcDM{p^}Ecdsxnu&hzK8YjulUcTl)m3)lI)X<@3@S4xBf3sm zw(FKwGUj8yR*LqjL1_nuDTDVf5sL}~#do}CSfyvpwC~A6(Cg-F9l_=1A~6v0qZoi~ zYbO|fc34b2hO;V)@LlZN5e)mY6c_7|%2`Z%xTuG})}Q%5LG)?mY)^1e9i|}d|L$^( zVOcCv1m^u=YWp)a>kYvU&=0N*L2g}js#8pS+hy$)O}$;ViciuIOk8C*_go@>=GfaC zp9DFJ>5p)+>Q&t^nu0MF|F7WR#heFgV_o~OO$qiV&}&bgq$Ajslt=SG*aVl^>kS}= zWi*il+H42yP6#vvzw0=o83E zR8`NHoq5wn*KBtL|M6k}%7;~rh-(K+Q$R`mUaf=%G^#fUdW4UaKrO-VQm8myxBg;` zDNTo;EzZ^ocb|GRSlN1lOL$$Li04x-En}#UppObX+T6-S5>3Gs4OCUcX7-Wv2+f}q zNL9|jr8(rzQ668SCD?V%%;&Q#ffZ83@D+5Lef+o%U|zfR1he+&_(y7>R-siZxA56l z+5_n{Pv8}E{er; zJI9Igb9HCHL*)mymS9rkvznfA=u&yI$C*?|^E}3FC#`A01MCN0Ovt__(+v+vf1dqW zi}l7z58EE^twK72<2>~P?<%5nP49SDt#h^8a(7tQeU#G4i3$6}853MOP5u7qw0uElm+$FH{dNkNHq z#8r#qkg9rsU$?yxS39s}7S$bbRGt@$fe}4pY^Nz9m1(gMI)j#AcdWB=?CKBGjgm<% zkCI@oZcgxUjp402PId(UDpc?_;`CElO#I);&mxn$kI6$;-@umO_pX7mLgj0%)McIh z=I>S+FSFIkI^}5Bo?y2uI@_jB<=tWaW&zz{8Cb`j##Q}&Q!thws*>`)xw|QKOOD}- z+Fspt_)seCsrPIMCRyo@@`tI!poPkmP93XL6bilYFB(+dt|izRH&P}CGa6wW*41@O z2bVrqmzpsB_Bw7Y!J^Cj6HyQx-m&3EZKxTmQo+JZ= zzr_ND>t?591?3cCOR literal 0 HcmV?d00001 diff --git a/core/test/data/blackbox/aztec-1/hello.txt b/core/test/data/blackbox/aztec-1/hello.txt new file mode 100644 index 000000000..b6fc4c620 --- /dev/null +++ b/core/test/data/blackbox/aztec-1/hello.txt @@ -0,0 +1 @@ +hello \ No newline at end of file diff --git a/core/test/src/com/google/zxing/aztec/AztecBlackBox1TestCase.java b/core/test/src/com/google/zxing/aztec/AztecBlackBox1TestCase.java index 0645e2500..465366f2c 100644 --- a/core/test/src/com/google/zxing/aztec/AztecBlackBox1TestCase.java +++ b/core/test/src/com/google/zxing/aztec/AztecBlackBox1TestCase.java @@ -26,10 +26,10 @@ public final class AztecBlackBox1TestCase extends AbstractBlackBoxTestCase { public AztecBlackBox1TestCase() { super("test/data/blackbox/aztec-1", new AztecReader(), BarcodeFormat.AZTEC); - addTest(11, 11, 0.0f); - addTest(11, 11, 90.0f); - addTest(11, 11, 180.0f); - addTest(11, 11, 270.0f); + addTest(12, 12, 0.0f); + addTest(12, 12, 90.0f); + addTest(12, 12, 180.0f); + addTest(12, 12, 270.0f); } } \ No newline at end of file