From: smparkes@smparkes.net Date: Tue, 17 Aug 2010 00:09:09 +0000 (+0000) Subject: remove CRLF files before readding them (in an attempt to not confuse SVN with EOL... X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=cf17656aeffbeb6d978832826bb2373f4a4adf4d remove CRLF files before readding them (in an attempt to not confuse SVN with EOL stuff) git-svn-id: http://zxing.googlecode.com/svn/trunk@1541 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- diff --git a/core/test/data/blackbox/qrcode-5/16.png b/core/test/data/blackbox/qrcode-5/16.png deleted file mode 100644 index 79631819..00000000 Binary files a/core/test/data/blackbox/qrcode-5/16.png and /dev/null differ diff --git a/core/test/data/blackbox/qrcode-5/16.txt b/core/test/data/blackbox/qrcode-5/16.txt deleted file mode 100644 index a8f10102..00000000 --- a/core/test/data/blackbox/qrcode-5/16.txt +++ /dev/null @@ -1,56 +0,0 @@ -THROUGH THE LOOKING-GLASS - -By Lewis Carroll - - -CHAPTER I. Looking-Glass house - -One thing was certain, that the WHITE kitten had had nothing to do with -it:--it was the black kitten's fault entirely. For the white kitten had -been having its face washed by the old cat for the last quarter of -an hour (and bearing it pretty well, considering); so you see that it -COULDN'T have had any hand in the mischief. - -The way Dinah washed her children's faces was this: first she held the -poor thing down by its ear with one paw, and then with the other paw she -rubbed its face all over, the wrong way, beginning at the nose: and -just now, as I said, she was hard at work on the white kitten, which was -lying quite still and trying to purr--no doubt feeling that it was all -meant for its good. - -But the black kitten had been finished with earlier in the afternoon, -and so, while Alice was sitting curled up in a corner of the great -arm-chair, half talking to herself and half asleep, the kitten had been -having a grand game of romps with the ball of worsted Alice had been -trying to wind up, and had been rolling it up and down till it had all -come undone again; and there it was, spread over the hearth-rug, all -knots and tangles, with the kitten running after its own tail in the -middle. - -'Oh, you wicked little thing!' cried Alice, catching up the kitten, and -giving it a little kiss to make it understand that it was in disgrace. -'Really, Dinah ought to have taught you better manners! You OUGHT, -Dinah, you know you ought!' she added, looking reproachfully at the old -cat, and speaking in as cross a voice as she could manage--and then she -scrambled back into the arm-chair, taking the kitten and the worsted -with her, and began winding up the ball again. But she didn't get on -very fast, as she was talking all the time, sometimes to the kitten, and -sometimes to herself. Kitty sat very demurely on her knee, pretending to -watch the progress of the winding, and now and then putting out one -paw and gently touching the ball, as if it would be glad to help, if it -might. - -'Do you know what to-morrow is, Kitty?' Alice began. 'You'd have guessed -if you'd been up in the window with me--only Dinah was making you tidy, -so you couldn't. I was watching the boys getting in sticks for the -bonfire--and it wants plenty of sticks, Kitty! Only it got so cold, and -it snowed so, they had to leave off. Never mind, Kitty, we'll go and -see the bonfire to-morrow.' Here Alice wound two or three turns of the -worsted round the kitten's neck, just to see how it would look: this led -to a scramble, in which the ball rolled down upon the floor, and yards -and yards of it got unwound again. - -'Do you know, I was so angry, Kitty,' Alice went on as soon as they were -comfortably settled again, 'when I saw all the mischief you had been -doing, I was very nearly opening the window, and putting you out into -the snow! And you diff --git a/core/test/data/blackbox/qrcode-5/17.png b/core/test/data/blackbox/qrcode-5/17.png deleted file mode 100644 index 96c6c7c9..00000000 Binary files a/core/test/data/blackbox/qrcode-5/17.png and /dev/null differ diff --git a/core/test/data/blackbox/qrcode-5/17.txt b/core/test/data/blackbox/qrcode-5/17.txt deleted file mode 100644 index da803942..00000000 --- a/core/test/data/blackbox/qrcode-5/17.txt +++ /dev/null @@ -1,46 +0,0 @@ -THROUGH THE LOOKING-GLASS - -By Lewis Carroll - - -CHAPTER I. Looking-Glass house - -One thing was certain, that the WHITE kitten had had nothing to do with -it:--it was the black kitten's fault entirely. For the white kitten had -been having its face washed by the old cat for the last quarter of -an hour (and bearing it pretty well, considering); so you see that it -COULDN'T have had any hand in the mischief. - -The way Dinah washed her children's faces was this: first she held the -poor thing down by its ear with one paw, and then with the other paw she -rubbed its face all over, the wrong way, beginning at the nose: and -just now, as I said, she was hard at work on the white kitten, which was -lying quite still and trying to purr--no doubt feeling that it was all -meant for its good. - -But the black kitten had been finished with earlier in the afternoon, -and so, while Alice was sitting curled up in a corner of the great -arm-chair, half talking to herself and half asleep, the kitten had been -having a grand game of romps with the ball of worsted Alice had been -trying to wind up, and had been rolling it up and down till it had all -come undone again; and there it was, spread over the hearth-rug, all -knots and tangles, with the kitten running after its own tail in the -middle. - -'Oh, you wicked little thing!' cried Alice, catching up the kitten, and -giving it a little kiss to make it understand that it was in disgrace. -'Really, Dinah ought to have taught you better manners! You OUGHT, -Dinah, you know you ought!' she added, looking reproachfully at the old -cat, and speaking in as cross a voice as she could manage--and then she -scrambled back into the arm-chair, taking the kitten and the worsted -with her, and began winding up the ball again. But she didn't get on -very fast, as she was talking all the time, sometimes to the kitten, and -sometimes to herself. Kitty sat very demurely on her knee, pretending to -watch the progress of the winding, and now and then putting out one -paw and gently touching the ball, as if it would be glad to help, if it -might. - -'Do you know what to-morrow is, Kitty?' Alice began. 'You'd have guessed -if you'd been up in the window with me--only Dinah was making you tidy, -so you couldn't. I was watching the boys getting in sticks for the -bonfire-- diff --git a/core/test/data/blackbox/qrcode-5/18.png b/core/test/data/blackbox/qrcode-5/18.png deleted file mode 100644 index 47ac72dc..00000000 Binary files a/core/test/data/blackbox/qrcode-5/18.png and /dev/null differ diff --git a/core/test/data/blackbox/qrcode-5/18.txt b/core/test/data/blackbox/qrcode-5/18.txt deleted file mode 100644 index 25e7ece3..00000000 --- a/core/test/data/blackbox/qrcode-5/18.txt +++ /dev/null @@ -1,34 +0,0 @@ -THROUGH THE LOOKING-GLASS - -By Lewis Carroll - - -CHAPTER I. Looking-Glass house - -One thing was certain, that the WHITE kitten had had nothing to do with -it:--it was the black kitten's fault entirely. For the white kitten had -been having its face washed by the old cat for the last quarter of -an hour (and bearing it pretty well, considering); so you see that it -COULDN'T have had any hand in the mischief. - -The way Dinah washed her children's faces was this: first she held the -poor thing down by its ear with one paw, and then with the other paw she -rubbed its face all over, the wrong way, beginning at the nose: and -just now, as I said, she was hard at work on the white kitten, which was -lying quite still and trying to purr--no doubt feeling that it was all -meant for its good. - -But the black kitten had been finished with earlier in the afternoon, -and so, while Alice was sitting curled up in a corner of the great -arm-chair, half talking to herself and half asleep, the kitten had been -having a grand game of romps with the ball of worsted Alice had been -trying to wind up, and had been rolling it up and down till it had all -come undone again; and there it was, spread over the hearth-rug, all -knots and tangles, with the kitten running after its own tail in the -middle. - -'Oh, you wicked little thing!' cried Alice, catching up the kitten, and -giving it a little kiss to make it understand that it was in disgrace. -'Really, Dinah ought to have taught you better manners! You OUGHT, -Dinah, you know you ought!' she added, looking reproachfully at the old -cat, and speaking in as cross a voice as she could manage--and then s diff --git a/core/test/data/blackbox/qrcode-5/19.png b/core/test/data/blackbox/qrcode-5/19.png deleted file mode 100644 index e8313374..00000000 Binary files a/core/test/data/blackbox/qrcode-5/19.png and /dev/null differ diff --git a/core/test/data/blackbox/qrcode-5/19.txt b/core/test/data/blackbox/qrcode-5/19.txt deleted file mode 100644 index b4d509f8..00000000 --- a/core/test/data/blackbox/qrcode-5/19.txt +++ /dev/null @@ -1,27 +0,0 @@ -THROUGH THE LOOKING-GLASS - -By Lewis Carroll - - -CHAPTER I. Looking-Glass house - -One thing was certain, that the WHITE kitten had had nothing to do with -it:--it was the black kitten's fault entirely. For the white kitten had -been having its face washed by the old cat for the last quarter of -an hour (and bearing it pretty well, considering); so you see that it -COULDN'T have had any hand in the mischief. - -The way Dinah washed her children's faces was this: first she held the -poor thing down by its ear with one paw, and then with the other paw she -rubbed its face all over, the wrong way, beginning at the nose: and -just now, as I said, she was hard at work on the white kitten, which was -lying quite still and trying to purr--no doubt feeling that it was all -meant for its good. - -But the black kitten had been finished with earlier in the afternoon, -and so, while Alice was sitting curled up in a corner of the great -arm-chair, half talking to herself and half asleep, the kitten had been -having a grand game of romps with the ball of worsted Alice had been -trying to wind up, and had been rolling it up and down till it had all -come undone again; and there it was, spread over the hearth-rug, all -knots and tangles, with the kitten running aft diff --git a/core/test/src/com/google/zxing/qrcode/QRCodeBlackBox5TestCase.java b/core/test/src/com/google/zxing/qrcode/QRCodeBlackBox5TestCase.java index ae5737b8..c2562c7a 100644 --- a/core/test/src/com/google/zxing/qrcode/QRCodeBlackBox5TestCase.java +++ b/core/test/src/com/google/zxing/qrcode/QRCodeBlackBox5TestCase.java @@ -34,7 +34,7 @@ public final class QRCodeBlackBox5TestCase extends AbstractBlackBoxTestCase { addTest(18, 18, 0.0f); addTest(19, 19, 90.0f); addTest(19, 19, 180.0f); - addTest(19, 19, 270.0f); + addTest(18, 18, 270.0f); } }