Commit graph

805 commits

Author SHA1 Message Date
srowen a0381b760d Avoid RSS-14 false positive issue, which temporarily hurts its scanning a lot, but will work more later. Readjust unit test pass counts, which seem to have drifted. The change is net neutral in any event.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1251 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-25 11:42:08 +00:00
srowen 59fbd6564e Issue 327. Relax decoder assumptions
git-svn-id: https://zxing.googlecode.com/svn/trunk@1243 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-10 11:10:49 +00:00
srowen 70933a7ffd To fix http://groups.google.com/group/zxing/browse_thread/thread/bf1d150a7ed44ee8#, try a little harder on 1D, which is fine
git-svn-id: https://zxing.googlecode.com/svn/trunk@1239 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-05 10:41:51 +00:00
srowen d273ab5dbc Prevent an array out of bounds exception I noticed in the web logs
git-svn-id: https://zxing.googlecode.com/svn/trunk@1238 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-04 21:15:39 +00:00
srowen 0c54a9f45b Caught a few J2ME incompatibilities in build
git-svn-id: https://zxing.googlecode.com/svn/trunk@1235 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-04 18:53:58 +00:00
srowen 0cf89d0402 Preliminary RSS-14 support. Not enabled yet in Android client.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1233 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-04 18:38:58 +00:00
srowen 4f072f67ee Per Brad Threatt -- don't fail early on NotFoundException when finding multiple finder patterns
git-svn-id: https://zxing.googlecode.com/svn/trunk@1232 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-02 14:58:18 +00:00
srowen 508697a318 Related to Issue 205, but not the direct issue: read both copies of the format info and use both in determining the right one. This avoids a close, but incorrect first match throwing off the decoding. Also fix creating an image from ByteMatrix -- was inverted
git-svn-id: https://zxing.googlecode.com/svn/trunk@1226 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-01 11:04:22 +00:00
srowen 5ef5f3b02d "Split" ReaderException into subclasses to enable more useful error reporting
git-svn-id: https://zxing.googlecode.com/svn/trunk@1195 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-02 08:23:46 +00:00
srowen f9b648c131 Fixed old unit test compile problem I probaby introduced
git-svn-id: https://zxing.googlecode.com/svn/trunk@1194 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-02 07:34:35 +00:00
srowen 87f2fada9a Pre-RSS-14 changes. Necessary code changes, but not the decoder. Committing this since it does no harm and clears out my client so I can modify these files for other purposes.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1193 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-01 19:41:17 +00:00
srowen 171bd88c5d Issue 331
git-svn-id: https://zxing.googlecode.com/svn/trunk@1191 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-29 10:27:07 +00:00
dswitkin 04d5b85502 This is a set of mobile image taken at 480x360 with difficult lighting.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1187 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-17 23:12:21 +00:00
dswitkin 395f145067 Deleted the old ean13-2 test data which contained high resolution blurry images. These are not the focus of ZXing and not worth testing against. I'm going to replace them shortly with more relevant test images.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1186 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-17 22:19:59 +00:00
srowen c2a6255e19 Fix/improvement from Jiayong
git-svn-id: https://zxing.googlecode.com/svn/trunk@1184 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-11 06:08:20 +00:00
srowen 719ed5b883 Undo the ^= true thing in more files
git-svn-id: https://zxing.googlecode.com/svn/trunk@1182 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-10 12:41:04 +00:00
srowen 2d0b3bc83a Issue 316
git-svn-id: https://zxing.googlecode.com/svn/trunk@1181 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-10 09:59:54 +00:00
srowen ae379e56e9 Better version of revision 1166 and 1165 -- corrects behavior, by changing code such that points are always within image. Happens to make one test image fail at one rotation, but think that was a 'false gain' so accepted that tiny step backwards.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1178 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-06 14:02:16 +00:00
srowen e44cc99359 Maybe avoid weird Proguard issue by removing inner class?
git-svn-id: https://zxing.googlecode.com/svn/trunk@1177 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-06 12:13:46 +00:00
srowen c7a5b5f0a9 Issue 311 fix
git-svn-id: https://zxing.googlecode.com/svn/trunk@1174 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-05 09:40:54 +00:00
srowen bfaa68426b Issue 309, don't fail if birthday is bad
git-svn-id: https://zxing.googlecode.com/svn/trunk@1172 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-04 20:02:33 +00:00
srowen d71f40fef6 Two tiny improvements to make code more consistent
git-svn-id: https://zxing.googlecode.com/svn/trunk@1170 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-03 16:15:39 +00:00
srowen a38b0123f6 Tighten up detection of URLs on some garbage strings
git-svn-id: https://zxing.googlecode.com/svn/trunk@1167 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-22 18:30:09 +00:00
srowen 00c49493c0 Oops realized DM decoder also benefits from that last possible fix
git-svn-id: https://zxing.googlecode.com/svn/trunk@1166 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-22 12:24:02 +00:00
srowen 18002649eb Guess of a fix at array index out of bounds problem observed in the wild
git-svn-id: https://zxing.googlecode.com/svn/trunk@1165 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-22 12:19:31 +00:00
srowen 2736b6e19e Unit test for some reason too stringent by one? was breaking in a clean build
git-svn-id: https://zxing.googlecode.com/svn/trunk@1164 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-22 12:18:32 +00:00
dswitkin 539f890acf Added a new build-optimized target to core for applications which want the library to be optimized but don't want to run ProGuard themselves against the entire app.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1162 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-20 20:08:32 +00:00
dswitkin e779586745 Made a small performance tweak (about 1% faster).
git-svn-id: https://zxing.googlecode.com/svn/trunk@1158 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-13 21:36:38 +00:00
dswitkin 5cc1df3c92 Finished work on the local binarizer and renamed it to HybridBinarizer. It uses the old histogram for 1D and the new approach for 2D. The unit tests don't fully demonstrate how much better this is in real-world lighting, but it pretty much solves the situation of pointing at a QR Code for 30 seconds without scanning, due to a shadow or gradient.
HybridBinarizer is now the default across all the fast clients and the unit tests.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1157 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-13 21:08:57 +00:00
dswitkin 8ba08bb916 Added the ability to track who is throwing exceptions and how often in the core library. Uncomment to enable it.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1155 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-13 17:10:02 +00:00
dswitkin fbff1b9718 Eliminated up to 700 execeptions being thrown per image by changing one method to return -1 on failure.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1154 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-13 16:58:28 +00:00
dswitkin b21dd14d9b Added a check so that the PDF417 reader can get through the partial blackbox test.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1152 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-13 15:02:33 +00:00
srowen ef4cdf1969 Issue 295 and Issue 294, treat ADR as wholly different addresses, not 2 lines of 1 address
git-svn-id: https://zxing.googlecode.com/svn/trunk@1150 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-10 15:50:54 +00:00
srowen 6271b86315 Issue 294, add support for several address lines in parsed results
git-svn-id: https://zxing.googlecode.com/svn/trunk@1148 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-10 00:34:54 +00:00
srowen 9f3ee05fe1 Opening up the Detector a little to allow extension, such as per Ralf
git-svn-id: https://zxing.googlecode.com/svn/trunk@1143 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-08 19:58:01 +00:00
srowen 27be3fb930 Oops, last change meant to include this -- changelist got split
git-svn-id: https://zxing.googlecode.com/svn/trunk@1142 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-08 19:49:52 +00:00
srowen 1e5964024b Make finder pattern detection a little more tolerant, per Ralf. Increases accuracy slightly.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1141 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-08 19:47:50 +00:00
srowen e0fc79fda0 Small bug fix from Ralf
git-svn-id: https://zxing.googlecode.com/svn/trunk@1140 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-08 15:51:32 +00:00
srowen edddb45040 Remove use of Hashtable.clone(), doesn't work in J2ME
git-svn-id: https://zxing.googlecode.com/svn/trunk@1139 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-08 12:02:35 +00:00
dswitkin bdc25cf5bc Removed three interfaces which weren't doing any good and were making the 1D class hierarchy even more complicated than it already is.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1138 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-08 02:15:35 +00:00
dswitkin 5c627db289 Added some comments and fixed up lines over 100 columns.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1134 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-03 20:35:10 +00:00
srowen efd5cc819f Issue 287
git-svn-id: https://zxing.googlecode.com/svn/trunk@1131 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-30 16:01:20 +00:00
srowen d1973dce0a Draft of 'thinking' visualization for barcode scanning. Works for 1D and QR codes.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1125 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-23 16:42:31 +00:00
srowen 88c77b18b8 Fixed unit test fail from vCard change
git-svn-id: https://zxing.googlecode.com/svn/trunk@1122 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-23 09:37:58 +00:00
srowen f75a6ec766 Loosen BDAY parsing for vCard results
git-svn-id: https://zxing.googlecode.com/svn/trunk@1118 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-22 11:14:39 +00:00
srowen b710e257eb More fixes, to cropping BufferedImages
git-svn-id: https://zxing.googlecode.com/svn/trunk@1109 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-13 10:46:04 +00:00
srowen 431ace93e1 Oops fixed typo in last patch
git-svn-id: https://zxing.googlecode.com/svn/trunk@1108 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-13 09:57:14 +00:00
srowen ac64595afa Be more conservative about choosing Kanji mode. Since we don't support mixed mode, can only use it when the input is all double-byte Kanji.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1107 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-13 09:49:49 +00:00
srowen 0debee9c71 Issue 271
git-svn-id: https://zxing.googlecode.com/svn/trunk@1106 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-13 09:17:18 +00:00
srowen 8e4824da68 Fix some double-reversed i-j problems in this code
git-svn-id: https://zxing.googlecode.com/svn/trunk@1104 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-12 22:18:25 +00:00
srowen 9fd4391f8e Added Code 39 check digit hint
git-svn-id: https://zxing.googlecode.com/svn/trunk@1098 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-04 22:00:27 +00:00
srowen e913ff5990 Remove some redundant 'throws'; allocate more reasonably sized StringBuffers for performance
git-svn-id: https://zxing.googlecode.com/svn/trunk@1093 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-02 10:16:03 +00:00
dswitkin 0fd5a2c506 - Created Barcode Scanner 3.0 beta 1, for Donut and above only.
- Added support for ACTION_SEND intent for encoding a QR from Contacts.
- Made VCARD parsing a little less strict.
- Updated help and fixed a minor UI issue.
- Removed vestigial intent support using the old package name.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1075 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-10-19 18:04:57 +00:00
srowen a9788f0419 Oops passing somewhat too large values for width / height -- were being used as right/bottom coordinates.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1074 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-10-13 17:20:25 +00:00
srowen fbcafd74c8 Issue 249, fix references to methods not in MIDP 2
git-svn-id: https://zxing.googlecode.com/svn/trunk@1073 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-10-13 17:16:19 +00:00
srowen 29b88b66e3 Improved history function
git-svn-id: https://zxing.googlecode.com/svn/trunk@1066 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-29 22:33:03 +00:00
srowen 63b8253e10 Remove MobileTag support -- outdated, unused, and not clear we support the direction MobileTag is going
git-svn-id: https://zxing.googlecode.com/svn/trunk@1060 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-23 13:33:45 +00:00
srowen 938c44c17a Another shot at TCP CLOSE_WAIT issue, and tiny code tweak
git-svn-id: https://zxing.googlecode.com/svn/trunk@1057 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-18 10:27:17 +00:00
srowen 3b557e6229 Run tests with -Xint to work around weird JIT bug in Java 6, which causes ArithmeticException failure in a few QR code tests
git-svn-id: https://zxing.googlecode.com/svn/trunk@1054 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-15 09:06:45 +00:00
srowen 5b041daad0 Spell checker fixes, narrowed scope / made less visible where possible. Little stuff
git-svn-id: https://zxing.googlecode.com/svn/trunk@1053 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-15 09:03:05 +00:00
srowen eef79f730b Fix for old logic error in seeking format information -- actually was comparing unmasked rather than masked values, though it ended up working
git-svn-id: https://zxing.googlecode.com/svn/trunk@1052 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-14 10:17:17 +00:00
srowen c02bd97b6a Tiny code adjustments from inspection
git-svn-id: https://zxing.googlecode.com/svn/trunk@1041 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-08-25 21:29:39 +00:00
srowen 46640620e9 Issue 230
git-svn-id: https://zxing.googlecode.com/svn/trunk@1040 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-08-24 06:49:57 +00:00
srowen e1dd41a115 Improve detector logic to throw out false positive finder patterns in a more reasonable manner. Current logic didn't quite achieve its goal in some corner cases and needed rethinking and some simplification. Fixes a reported failure from the group list. Net change in passed test cases is -1 otherwise (for 270 degree rotation -- not vital) so I consider it a net tiny win.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1039 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-08-23 15:32:01 +00:00
srowen 362236564e Miscellaneous changes from FindBugs analysis
git-svn-id: https://zxing.googlecode.com/svn/trunk@1038 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-08-22 15:16:36 +00:00
srowen 6dbf893cb0 Add MatrixToImageWriter convenience class, small code tweaks in javase/, make ByteMatrix width/height property getters names standard
git-svn-id: https://zxing.googlecode.com/svn/trunk@1028 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-30 08:58:57 +00:00
dswitkin d8b1011324 Fixed some long lines over 100 columns.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1027 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-23 22:10:43 +00:00
srowen 4331605913 Added error correction level to Result
git-svn-id: https://zxing.googlecode.com/svn/trunk@1026 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-22 10:40:18 +00:00
srowen 91d8e04d86 Re-enable ProGuard, and finally identified the workaround that seems to make 4.4 work with our code without a VerifyError
git-svn-id: https://zxing.googlecode.com/svn/trunk@1025 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-22 10:36:11 +00:00
srowen 9f475ac33e Small detector simplification that addresses issue 215 and picks up a net +4 more images decoded in tests
git-svn-id: https://zxing.googlecode.com/svn/trunk@1022 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-21 09:39:31 +00:00
srowen 636c00e844 Another tweak to get some valid ISO-8859-1 strings like "frédéric" to be guessed correctly
git-svn-id: https://zxing.googlecode.com/svn/trunk@1021 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-17 09:30:46 +00:00
dswitkin 54e6ed418a More x, y cleanup and 100 column fixes.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1017 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-08 21:17:52 +00:00
dswitkin 402880798c Modified my skew correction code to also work upside down, meaning we now decode three more inverted PDF 417 images.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1016 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-08 20:38:21 +00:00
dswitkin b238cb7828 I noticed that the codeword coordinates in PDF 417 barcodes were a few pixels off if there was skew or rotation in the image. I added a simple method to correct the vertical component of these points, and the units tests went from 8/23 to 11/23.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1015 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-02 20:07:09 +00:00
dswitkin 0944a2bb18 Got 180 degree rotation working for PDF 417, and turned on the appropriate unit tests as a result.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1014 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-01 19:42:52 +00:00
dswitkin af2ce46c37 Cleaned up a number of comments and code to fit in 100 columns and added some TODO items.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1013 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-01 16:35:05 +00:00
dswitkin e44f00ba75 Converted the last user of the old MonochromeBitmapSource-style calls over to BitMatrix, and removed these deprecated methods.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1012 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-01 16:13:25 +00:00
dswitkin c31b489efe Added the second PDF 417 test to the AllPositiveBlackBoxTester.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1011 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-01 15:13:44 +00:00
dswitkin 01eed5266e - Converted parts of the PDF 417 reader to use BitMatrix.
- Changed the PDF 417 detector to search the image more broadly, instead of assuming the barcode starts in the left 1/4 and ends in the right 1/4. We now get 8/23 on the real-world blackbox test, and we'll probably do even better with further improvements here.
- Added a quiet zone to two of the unit test images and updated a golden result for one of them. We now get 3/7 on the first test.
- Tried to fix some bugs in the upside down code but it still doesn't work.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1010 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-30 21:55:19 +00:00
dswitkin 0667b29155 Added the PDF 417 blackbox tests to the test-blackbox Ant target.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1009 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-30 18:51:43 +00:00
dswitkin f5124cec37 Created a new blackbox unit test of real-world PDF 417 images taken with an Android device. Currently we decode 0/23.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1008 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-30 18:47:34 +00:00
dswitkin 2397216901 Added a few computer-generated PDF 417 barcodes to the blackbox tests. The current code doesn't seem to handle more advanced error correction modes.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1007 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-30 17:32:12 +00:00
dswitkin eb8b9677cf Added the previous Android benchmark I've been using to track performance, as well as a new one which uses wider images and therefore twice as many pixels.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1006 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-29 22:08:38 +00:00
dswitkin e2324bc2ae Added slightly better blackbox unit test stats.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1005 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-29 21:57:59 +00:00
dswitkin 10dfe7789b - Got the DataMatrix decoder compiling again with a quick bandaid.
- Fixed two bugs in the LocalBlockBinarizer sharpening routine. It can now decode 2132 images in our blackbox tests, compared to 2103 using the global histogram approach.
- Added the PDF 417 blackbox test to AllPositiveBlackBoxTester, and allowed it to complete even if the tests fail.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1004 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-29 15:49:42 +00:00
srowen 597fcfb23d Code analysis tweaks
git-svn-id: https://zxing.googlecode.com/svn/trunk@1003 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-28 16:33:02 +00:00
srowen 550511d760 Remove use of BinaryBitmap in QR Code, DM
git-svn-id: https://zxing.googlecode.com/svn/trunk@999 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-26 19:22:48 +00:00
dswitkin ce1badea71 Sean had a good idea to add @deprecated Javadoc comments to these three methods to help track down their usage. We can't use a Java @Deprecated annotation because core builds against Java 1.2.
git-svn-id: https://zxing.googlecode.com/svn/trunk@998 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-26 19:04:12 +00:00
dswitkin 167197ec7a Refactored the MonochromeBitmapSource class hierarchy into LuminanceSource, Binarizer, and BinaryBitmap classes. The unit tests pass and I believe the change is complete, but there are some clients like J2ME and Bug that I can't build.
This change will allow new thresholding algorithms to be developed and tested, as well as implemented per platform if needed (e.g. in JNI on Android). It should also perform better when multiple 2D Readers are installed, because the underlying image will only be converted to 1 bit once. It also allows some platforms to return luminance data without a copy.

The current state of this checkin is to use the old black point algorithm, which now lives in GlobalHistogramBinarizer. This will be our benchmark and fallback for slower platforms. Going forward we will begin to use LocalBlockBinarizer as I shake out the edge cases and tune it for performance. Currently it is unused.

IMPORTANT: I have temporarily included three methods from MonochromeBitmapSource at the end of BinaryBitmap as a way to make this change in stages. They are deprecated and will be removed soon. All of the Reader classes will need to change the way they examine 1 bit pixels to use the new getBlackRow() and getBlackMatrix() calls.

git-svn-id: https://zxing.googlecode.com/svn/trunk@993 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-26 17:49:45 +00:00
kev.sully 974fb5e403 ISSUE: http://code.google.com/p/zxing/issues/detail?id=42
Added PDF417 to list of readers. Will be used only if its specified in a Hint.

git-svn-id: https://zxing.googlecode.com/svn/trunk@987 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-26 14:34:16 +00:00
dswitkin da4f56b022 Fixed some code which was ignoring the result of MonochromeBitmapSource calls, which may work in some cases but isn't legal and failed and in some experiments.
git-svn-id: https://zxing.googlecode.com/svn/trunk@986 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-25 19:46:49 +00:00
srowen 969088fa82 Style changes mostly
git-svn-id: https://zxing.googlecode.com/svn/trunk@985 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-24 13:19:53 +00:00
kev.sully 372dfa1145 ISSUE: http://code.google.com/p/zxing/issues/detail?id=42
Added PDF417 to list of readers. Will be used only if its specified in a Hint.

git-svn-id: https://zxing.googlecode.com/svn/trunk@984 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-24 10:03:37 +00:00
kev.sully ffbbda2086 ISSUE: http://code.google.com/p/zxing/issues/detail?id=42
Added PDF417 to list of readers. Will be used only if its specified in a Hint.

git-svn-id: https://zxing.googlecode.com/svn/trunk@983 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-24 10:02:58 +00:00
kev.sully db23e7c3b1 ISSUE: http://code.google.com/p/zxing/issues/detail?id=42
Added PDF417 to list of readers. Will be used only if its specified in a Hint.

git-svn-id: https://zxing.googlecode.com/svn/trunk@982 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-24 10:02:27 +00:00
kev.sully 36db720dac ISSUE: http://code.google.com/p/zxing/issues/detail?id=42
Added PDF417 to list of readers. Will be used only if its specified in a Hint.

git-svn-id: https://zxing.googlecode.com/svn/trunk@981 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-24 10:02:04 +00:00
kev.sully f80399966f ISSUE: http://code.google.com/p/zxing/issues/detail?id=42
Added PDF417 to list of readers. Will be used only if its specified in a Hint.

git-svn-id: https://zxing.googlecode.com/svn/trunk@980 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-24 10:01:47 +00:00
dswitkin 6367973b49 Added a clear() method to BitMatrix.
git-svn-id: https://zxing.googlecode.com/svn/trunk@979 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-23 21:05:09 +00:00
dswitkin b613112615 Rewrote BitMatrix to allow rectangular 2D arrays, and so that every row begins with a new int, which makes it fast to copy out rows into BitArrays. This will be the basis of the upcoming bitmap refactoring for 1D Readers.
git-svn-id: https://zxing.googlecode.com/svn/trunk@978 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-22 21:03:34 +00:00
dswitkin 7fec06465a Continuing with the x, y coordinate push, BitMatrix is now standardized. I also converted DataMask back to i, j for now to be consistent with the rest of the QR module, and made sure all the tests still pass.
git-svn-id: https://zxing.googlecode.com/svn/trunk@977 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-22 19:52:51 +00:00
srowen 4b7e5e6461 Remove getBits()
git-svn-id: https://zxing.googlecode.com/svn/trunk@976 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-22 17:48:37 +00:00
dswitkin 5f2b64ee50 Used IntelliJ's amazing refactoring functions to change the argument ordering of ByteMatrix. I want to standardize this across ZXing: the first component should always be horizontal and the second vertical, whether supplying an x, y point or a width, height pair. Also, we should always use x and y as variables with x being the horizontal component to avoid confusion.
git-svn-id: https://zxing.googlecode.com/svn/trunk@975 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-22 15:50:08 +00:00
dswitkin 406f353e53 Modified some comments to reflect that these objects are thread-safe but not reentrant.
git-svn-id: https://zxing.googlecode.com/svn/trunk@974 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-22 15:32:59 +00:00
dswitkin 0c3a4b4b5a Updated some comments about thread safety and fixed one easy case. Sean, please have a look.
git-svn-id: https://zxing.googlecode.com/svn/trunk@973 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-19 19:08:31 +00:00
srowen 63a1dc62a3 Issue 198
git-svn-id: https://zxing.googlecode.com/svn/trunk@972 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-19 13:23:09 +00:00
dswitkin 9f509172b6 Wrote a quick command line app to calculate how many total images are passing our blackbox unit tests. This could use some improvement but it's a start.
git-svn-id: https://zxing.googlecode.com/svn/trunk@971 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-18 20:55:42 +00:00
dswitkin 1da9bd60b3 Added a new blackbox test with extreme shadows and highlights. We do pretty poorly on this, but I've been experimenting with local thresholding algorithms which are a night and day improvement.
Also made the ImageConverter app ignore some kinds of files.

git-svn-id: https://zxing.googlecode.com/svn/trunk@969 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-16 18:47:34 +00:00
srowen 5c17a1ad71 Added getBlackDiagonal() which I likely want to use later
git-svn-id: https://zxing.googlecode.com/svn/trunk@968 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-11 13:42:39 +00:00
dswitkin c07fad6410 Created a new QR blackbox test with difficult exposures, mostly self-shadowing cases. We only get 34 out of 120 tests, which is about what I expected. To fix these we will have to move away from a global black point and towards a more sophisticated local thresholding algorithm.
git-svn-id: https://zxing.googlecode.com/svn/trunk@961 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-28 18:45:48 +00:00
dswitkin 932715065b Only allocate a StringBuffer if the start pattern has been found successfully in the ITFReader.
git-svn-id: https://zxing.googlecode.com/svn/trunk@958 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-27 21:11:10 +00:00
srowen dbb2c31a40 Fixed an old misspelling and a few tiny tweaks
git-svn-id: https://zxing.googlecode.com/svn/trunk@956 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-27 10:03:23 +00:00
srowen 58c367d9ea Improvement to Shift_JIS encoding detector to avoid detecting some UTF-8 strings as Shift_JIS
git-svn-id: https://zxing.googlecode.com/svn/trunk@955 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-27 09:14:17 +00:00
srowen 78c1b8ccd7 Oops, one more fix to rotateCounterClockwise() here
git-svn-id: https://zxing.googlecode.com/svn/trunk@952 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-24 13:06:51 +00:00
srowen 4282827336 More intelligence to avoid very deep recursion
git-svn-id: https://zxing.googlecode.com/svn/trunk@951 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-23 10:33:53 +00:00
dswitkin ec77a581d2 Changed the 2D histogram calculation to sample four rows spread across the image rather than taking a diagonal. We get a net increase of 63 blackbox tests with this change.
git-svn-id: https://zxing.googlecode.com/svn/trunk@950 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-22 20:59:15 +00:00
srowen 825d99786d Off by one error in last change
git-svn-id: https://zxing.googlecode.com/svn/trunk@949 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-22 08:19:11 +00:00
dswitkin 51ade2ca96 Added better logging for our blackbox tests. It now displays the number of images which passes per test out of the total, and the percentage. It also warns when a blackbox test is too lax (i.e. we've made decoding improvements but haven't raised the high water mark).
git-svn-id: https://zxing.googlecode.com/svn/trunk@947 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-21 21:18:27 +00:00
dswitkin 6687d5772f Fixed a typo in our golden results.
git-svn-id: https://zxing.googlecode.com/svn/trunk@946 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-21 20:29:56 +00:00
dswitkin e19e9a83f6 I moved a chunk of the histogram/black point code out of BaseMonochromeBitmapSource and into BlackPointEstimator which makes a lot more sense. Unfortunately I had to expose three new methods and touch a bunch of files. But I did manage to reuse an array on subsequent calls, which was being allocated on every row scanned, so that might be a bit faster. It will also be easier to convert this code to JNI in the future if we want to, and/or do more advanced thresholding.
git-svn-id: https://zxing.googlecode.com/svn/trunk@945 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-21 19:56:25 +00:00
dswitkin 038f113274 Moved CroppedMonochromeBitmapSource into the common package and fixed some more 100 column issues.
git-svn-id: https://zxing.googlecode.com/svn/trunk@944 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-21 18:46:53 +00:00
dswitkin c9d3eae171 Cleaned up some code to fit in 100 columns.
git-svn-id: https://zxing.googlecode.com/svn/trunk@942 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-21 15:36:51 +00:00
srowen bd73aebc73 Be smarter about recursion to avoid infinite loop
git-svn-id: https://zxing.googlecode.com/svn/trunk@940 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-21 14:26:29 +00:00
srowen 76eeeed99a Add toString() for easy debugging
git-svn-id: https://zxing.googlecode.com/svn/trunk@939 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-11 21:51:20 +00:00
srowen 793f4c7176 Marginal improvement to datamatrix decoder
git-svn-id: https://zxing.googlecode.com/svn/trunk@937 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-11 21:02:08 +00:00
srowen 0c07f139b5 Fix issue 189. Need to guard against 'false positive' success in reading version info.
git-svn-id: https://zxing.googlecode.com/svn/trunk@934 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-06 21:50:13 +00:00
srowen b2bd63a228 Alternate multi QR Code reader from Hannes
git-svn-id: https://zxing.googlecode.com/svn/trunk@933 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-05 09:52:46 +00:00
srowen a26e5fbc10 Forge ahead with detection even if we missed an alignment pattern -- can still decode in some cases without it
git-svn-id: https://zxing.googlecode.com/svn/trunk@929 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-03 19:52:03 +00:00
srowen 361f4504a3 Add MultipleBarcodeReader interface to allow for more implementations
git-svn-id: https://zxing.googlecode.com/svn/trunk@927 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-03 05:56:51 +00:00
srowen 7e86f379ea Moved MultipleBarcodeReader and added ByQuadrantReader to try to accommodate many QR codes in an image
git-svn-id: https://zxing.googlecode.com/svn/trunk@921 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-30 19:12:32 +00:00
srowen 949eca972e Adding a few test images from a defunct issue report
git-svn-id: https://zxing.googlecode.com/svn/trunk@919 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-28 22:29:30 +00:00
srowen 29d7d6443e Issue 183: Adds support for detecting multiple barcodes, and simplifies ResultPoint abstraction
git-svn-id: https://zxing.googlecode.com/svn/trunk@918 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-28 17:35:33 +00:00
srowen e9c19530cc Improve URL detection rule to exclude stuff like "Hi."
git-svn-id: https://zxing.googlecode.com/svn/trunk@914 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-18 08:57:32 +00:00
srowen e74c041e46 Improve URL detection rule to exclude stuff like "Hi."
git-svn-id: https://zxing.googlecode.com/svn/trunk@913 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-18 08:02:08 +00:00
srowen d08ddbe733 In extreme decoder failure case, make sure not to let an IAE propagate up. Turn it into ReaderException.
git-svn-id: https://zxing.googlecode.com/svn/trunk@911 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-17 21:30:36 +00:00
dswitkin 02f779cbee Fixed or removed a bunch of TODOs, and enforced the 100 columns limit in a bunch of places. Also allowed QR Codes to be encoded of contacts without names.
git-svn-id: https://zxing.googlecode.com/svn/trunk@907 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-13 21:20:11 +00:00
srowen 94915afb71 Enable DataMatrix in the web app / other small tweaks (forgot one class!); also fix a small bug in QRCodeWriter
git-svn-id: https://zxing.googlecode.com/svn/trunk@904 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-12 06:39:10 +00:00
srowen dea0247615 Enable DataMatrix in the web app / other small tweaks
git-svn-id: https://zxing.googlecode.com/svn/trunk@903 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-10 13:46:11 +00:00
srowen 3d8d68a464 Issue 165
git-svn-id: https://zxing.googlecode.com/svn/trunk@900 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-06 21:56:06 +00:00
srowen 3c84048565 Issue 164
git-svn-id: https://zxing.googlecode.com/svn/trunk@898 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-06 21:46:02 +00:00
srowen d4e82758eb Issue 158: Correct some off-by-one problems in Data Matrix detector and a few more improvements, ignore unsupported DM symbols
git-svn-id: https://zxing.googlecode.com/svn/trunk@895 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-06 21:22:07 +00:00
srowen 0210ec9fe9 Fixed tiny javadoc glitches
git-svn-id: https://zxing.googlecode.com/svn/trunk@892 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-12 21:17:06 +00:00
dswitkin dfb6b60dd4 - Added a new unit test of 13 ITF images I took with a T-Mobile G1.
- Added upside down unit tests for the existing ITF images.
- Removed the temporary format code from these tests now that ITF is on by default.

git-svn-id: https://zxing.googlecode.com/svn/trunk@883 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-09 20:48:48 +00:00
dswitkin 5b5c7945bb Turned on ITF support in the Android client, and fixed a bug in the ITF result points, which by convention should draw across the whole body of the barcode, not just the start range.
git-svn-id: https://zxing.googlecode.com/svn/trunk@881 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-09 15:57:57 +00:00
srowen 7561941341 Tiny optimization to reverse()
git-svn-id: https://zxing.googlecode.com/svn/trunk@880 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-09 15:56:08 +00:00
dswitkin 04ff9c43b5 Turned on ITF support by default. The typical overhead in real world scanning on an Android device is 3-8 ms.
git-svn-id: https://zxing.googlecode.com/svn/trunk@879 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-09 15:46:27 +00:00
srowen e367d3ef96 Fixed decodeEnd() situation whereby row might not be re-reversed, and fixed an old NPE I caused
git-svn-id: https://zxing.googlecode.com/svn/trunk@878 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-07 10:51:03 +00:00
srowen 8b339661d9 Some clever, perhaps too-clever optimization of masking code
git-svn-id: https://zxing.googlecode.com/svn/trunk@877 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-06 22:55:19 +00:00
dswitkin c1bc060065 Changed the order of the BaseMonochromeBitmapSource constructor arguments to be width, height to match the rest of the codebase, and added two apparently missing methods to the J2ME subclass, although I can't test it.
git-svn-id: https://zxing.googlecode.com/svn/trunk@874 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-06 16:52:35 +00:00
srowen 6fe022eb10 Normalize GEO: to geo:
git-svn-id: https://zxing.googlecode.com/svn/trunk@873 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-06 15:25:26 +00:00
srowen 415c9257d6 Fix #150 again by moving towards a more RFC 2822-compliant definition of valid syntax
git-svn-id: https://zxing.googlecode.com/svn/trunk@872 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-06 15:17:38 +00:00
srowen 83f6b96f82 Backed out last 'fix' to email address parsing -- isn't going to work. Needs a better, real fix.
git-svn-id: https://zxing.googlecode.com/svn/trunk@871 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-05 02:28:57 +00:00
srowen cf24cfd453 Normalize TEL: to tel: to make sure it works with Android
git-svn-id: https://zxing.googlecode.com/svn/trunk@870 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-05 02:26:21 +00:00
srowen ddffcde9f4 Address Issue 152
git-svn-id: https://zxing.googlecode.com/svn/trunk@869 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-05 02:19:48 +00:00
srowen b24fbdd7b0 Tiny optimizations to boolean logic to avoid extra byte code and branches in semi-critical sections
git-svn-id: https://zxing.googlecode.com/svn/trunk@867 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-02-23 13:52:45 +00:00
srowen 1e96791817 git-svn-id: https://zxing.googlecode.com/svn/trunk@859 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2009-02-15 12:38:12 +00:00
srowen 8e73582187 A fixed fix for email parsing
git-svn-id: https://zxing.googlecode.com/svn/trunk@858 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-02-15 12:00:52 +00:00
srowen dd1eccfda8 Tighten email check logic a little
git-svn-id: https://zxing.googlecode.com/svn/trunk@857 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-02-15 09:45:52 +00:00
srowen 8e18d651bb Tightened a condition to reduce accidentally detecting the alignment pattern as a finder pattern
git-svn-id: https://zxing.googlecode.com/svn/trunk@856 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-02-15 09:43:40 +00:00
srowen f2a9165b7c Refactored width/height values into superclass and enabled construction of RGBMonochromeBitmapSource from a Bitmap
git-svn-id: https://zxing.googlecode.com/svn/trunk@846 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-02-09 21:25:45 +00:00
srowen 089cc3ac44 Fix Issue 143, failure on invalid geo: URIs
git-svn-id: https://zxing.googlecode.com/svn/trunk@842 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-02-06 13:30:10 +00:00
srowen db61519508 More changes in the direction of supporting ECI in the encoder
git-svn-id: https://zxing.googlecode.com/svn/trunk@837 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-31 20:17:43 +00:00
srowen 807c1646b9 Added basic support for caller-specified character encoding
git-svn-id: https://zxing.googlecode.com/svn/trunk@836 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-31 00:40:04 +00:00
srowen 1e8155190d Add ALLOWED_LENGTHS hint, for now, in support of ITF
git-svn-id: https://zxing.googlecode.com/svn/trunk@834 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-30 17:29:27 +00:00
srowen 4d225d48e1 Fix a nagging inconvenience from my IDE in running tests, due to working directory issues
git-svn-id: https://zxing.googlecode.com/svn/trunk@832 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-28 19:03:25 +00:00
srowen bb373c5929 Oops, StringBuffer.append(StringBuffer) doesn't exist in J2ME
git-svn-id: https://zxing.googlecode.com/svn/trunk@831 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-27 23:24:23 +00:00
srowen f05302cc4c Actually, let the scanner read codes using structured append -- just ignore these segments and show whatever part of the overall message that this code encodes
git-svn-id: https://zxing.googlecode.com/svn/trunk@830 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-21 21:07:00 +00:00
srowen 6a5d483aa5 Issue 127: Add structured append mode and make it clear this is not supported
git-svn-id: https://zxing.googlecode.com/svn/trunk@828 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-20 23:15:09 +00:00
srowen 25bdb39ac1 Remove WTK dependency which added little and only made life hard for mac users
git-svn-id: https://zxing.googlecode.com/svn/trunk@825 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-15 21:03:37 +00:00
srowen 5efb6ef335 Separated rectangle detection from decoder for reuse
git-svn-id: https://zxing.googlecode.com/svn/trunk@824 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-14 10:44:46 +00:00
srowen 37fbeaa36a Small updates from code inspection
git-svn-id: https://zxing.googlecode.com/svn/trunk@823 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-10 17:01:34 +00:00
dswitkin 0a885aca56 Added 18 real world DataMatrix blackbox images, plus turned on rotation for the original set.
git-svn-id: https://zxing.googlecode.com/svn/trunk@815 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-06 21:11:55 +00:00
srowen d0bc7df5d4 On a tip from Sandy found an error in the QR code detector that would miss a third finder pattern in cases of about 135 degree rotation. This changes test results but is a net win.
git-svn-id: https://zxing.googlecode.com/svn/trunk@814 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-01-04 21:11:25 +00:00
srowen 9433c5955b Add more unit tests for client.result, and more small code tweaks.
git-svn-id: https://zxing.googlecode.com/svn/trunk@809 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-30 15:31:25 +00:00
dswitkin 3269c66e77 Moved one file back to the ITF directory because it should be readable.
git-svn-id: https://zxing.googlecode.com/svn/trunk@806 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-23 17:21:31 +00:00
kev.sully 12a283ebf9 ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Moved failing test cases to partial.

git-svn-id: https://zxing.googlecode.com/svn/trunk@805 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-23 12:11:14 +00:00
kev.sully c1ee018a50 ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Moved failing test cases to partial.

git-svn-id: https://zxing.googlecode.com/svn/trunk@804 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-23 12:10:30 +00:00
dswitkin 96b80c3550 Turned on ITF as a format you can request via hint. Also rejiggered the unit test framework to accept an optional hint so that the ITF unit test runs (and passes) without modifying the source.
git-svn-id: https://zxing.googlecode.com/svn/trunk@803 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-22 22:58:58 +00:00
kev.sully 0a3ddd33dc ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Added more test cases for ITF

git-svn-id: https://zxing.googlecode.com/svn/trunk@802 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-22 12:41:14 +00:00
kev.sully 5545bdb317 ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Added more test cases for ITF

git-svn-id: https://zxing.googlecode.com/svn/trunk@801 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-22 12:40:37 +00:00
srowen d242b00126 More small changes from code inspection
git-svn-id: https://zxing.googlecode.com/svn/trunk@800 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-21 18:54:58 +00:00
srowen fa59c4e093 Correct exception handling in certain situations so that routine decoding failures do not produce IllegalArgumentException
git-svn-id: https://zxing.googlecode.com/svn/trunk@799 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-21 18:40:41 +00:00
dswitkin f50dcf6d27 Added golden results to all of our result parsing unit tests, uncovering and fixing a few subtle bugs in the process. I also expanded a few of them which were lean.
git-svn-id: https://zxing.googlecode.com/svn/trunk@796 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-19 20:20:54 +00:00
dswitkin 48480eba95 Fixed crash and bad parsing of an SMS with a question mark in the subject or message.
git-svn-id: https://zxing.googlecode.com/svn/trunk@794 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-19 15:00:20 +00:00
srowen 131cfe4c5c More reckless refactoring and code style tweaks -- mostly adding braces around conditional/loops, and using @Override
git-svn-id: https://zxing.googlecode.com/svn/trunk@784 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-11 23:34:49 +00:00
srowen 6c5b6849b7 Another attack on integrating encoder and decoder: Version is done. Attempted to rationalize encoding API to deal with strings, not bytes. More code style changes like removal of 'final' on locals and arguments.
git-svn-id: https://zxing.googlecode.com/svn/trunk@781 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-10 00:22:14 +00:00
dswitkin f265d0872f Made our parsing code handle uppercase prefixes for a variety of loosely-defined formats.
git-svn-id: https://zxing.googlecode.com/svn/trunk@779 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-08 23:08:23 +00:00
srowen 12420b443d Fix apparently-inconsequential typo in QR code encoder test case
git-svn-id: https://zxing.googlecode.com/svn/trunk@778 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-05 16:46:53 +00:00
dswitkin 3ef2b0b618 Fixed a bug in geo coordinate display, where we were always tacking on "deg N" and "deg E", which doesn't make sense. Really, N/S/E/W needs to be determined by sign, and the sign removed for W and S. However, since none of that can be translated easily, I removed it, and we now just print lat, long which is an acceptable standard.
I also bumped the Android client to v2.4 final.

git-svn-id: https://zxing.googlecode.com/svn/trunk@776 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-03 16:14:56 +00:00
srowen c74735c1b4 Unify handling of Mode too
git-svn-id: https://zxing.googlecode.com/svn/trunk@771 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-02 01:30:57 +00:00
srowen 784673a241 Unify handling of EC level between encoder and decoder
git-svn-id: https://zxing.googlecode.com/svn/trunk@770 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-02 01:00:18 +00:00
srowen 416193ff9a Big rename of variables and method to have more standard Java names
git-svn-id: https://zxing.googlecode.com/svn/trunk@769 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-02 00:31:10 +00:00
srowen 10a90bfecf Some formatting changes, and a few tiny optimizations
git-svn-id: https://zxing.googlecode.com/svn/trunk@768 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-02 00:10:46 +00:00
srowen 36e9361184 Some formatting changes, and a few tiny optimizations
git-svn-id: https://zxing.googlecode.com/svn/trunk@767 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-01 21:36:58 +00:00
dswitkin c3564411fb Added a new QR Code unit test of real world photos of t-shirts. These are notoriously difficult because the barcodes don't lie completely flat. We're able to decode 33/48 which is better than I thought, although most of the images which fail look within reach.
git-svn-id: https://zxing.googlecode.com/svn/trunk@764 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-26 16:39:34 +00:00
dswitkin 98b34ae187 Made Java naming changes to BitVector.
git-svn-id: https://zxing.googlecode.com/svn/trunk@757 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-21 17:06:52 +00:00
kev.sully afdc4508b7 ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Changes to fix high nbr of false positives.
- Removed requirement that the barcode fills the viewfinder
- Extended the check on the lenght of decoded barcode - now only 6, 10 and 14 digit barcodes are supported.

git-svn-id: https://zxing.googlecode.com/svn/trunk@756 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-21 16:40:40 +00:00
kev.sully 85506667a7 ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Changes to fix high nbr of false positives.
- Fixed up the quiet zone checks.
- Validate that the barcode fills the viewfinder
- Check that decoded barcode is min 6 digits


git-svn-id: https://zxing.googlecode.com/svn/trunk@755 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-21 11:25:45 +00:00
kev.sully 1e9123b0af ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Commented out references to ITFReader until it is validated as production ready.

git-svn-id: https://zxing.googlecode.com/svn/trunk@754 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-21 09:40:13 +00:00
dswitkin 87e0ba7523 Removed some logging from the QR encoder. Nothing in core should be printf'ing - we can always inspect these with a debugger if needed. Also removed the temporary README about this package not compiling.
git-svn-id: https://zxing.googlecode.com/svn/trunk@753 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 22:43:20 +00:00
dswitkin 0f648cd1be Ported and rewrote the Renderer unit test to test QRCodeWriter. We encode several barcodes looking for good behavior, and several others which are compared pixel by pixel to golden results stored in PNGs. I'm happy to say we nail the three images Satoru created to the dot!
Along the way, I added support for encoder hints, and no longer hardcode the error correction level.

git-svn-id: https://zxing.googlecode.com/svn/trunk@752 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 22:39:31 +00:00
kev.sully dab0c22347 ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Renamed test cases dir to itf-1 (removed 14 specific reference)

git-svn-id: https://zxing.googlecode.com/svn/trunk@749 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 17:34:23 +00:00
kev.sully 7eb787da2e ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Renamed test cases dir to itf-1 (removed 14 specific reference)

git-svn-id: https://zxing.googlecode.com/svn/trunk@748 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 17:33:20 +00:00
kev.sully 8723de9917 ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Added more test cases for ITF.

git-svn-id: https://zxing.googlecode.com/svn/trunk@747 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 17:29:22 +00:00
kev.sully e851b8d293 ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Added more test cases for ITF.

git-svn-id: https://zxing.googlecode.com/svn/trunk@746 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 17:28:52 +00:00
kev.sully b0ef487b31 ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Renamed ITF14Reader to ITFReader. ITFReader now reads arbitrary number of digits. Added a QuietZone check. Removed checksum validation. Added more test cases.

git-svn-id: https://zxing.googlecode.com/svn/trunk@745 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 17:27:12 +00:00
kev.sully 233ae565fe ISSUE: http://code.google.com/p/zxing/issues/detail?id=110
Renamed ITF14Reader to ITFReader. ITFReader now reads arbitrary number of digits. Added a QuietZone check. Removed checksum validation. Added more test cases.

git-svn-id: https://zxing.googlecode.com/svn/trunk@744 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 17:26:34 +00:00
srowen 4928f6bd07 git-svn-id: https://zxing.googlecode.com/svn/trunk@743 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2008-11-20 17:10:44 +00:00
dswitkin a8d732d084 Ported over the BitVector bug fix and new unit test from Satoru.
git-svn-id: https://zxing.googlecode.com/svn/trunk@742 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 17:08:30 +00:00
srowen 56f194794b Added ITF-14 decoder from Kevin. Not enabled yet as we need to think a bit about how to handle this first. Also, the unit tests aren't passing for me but are for Kevin so I have commented them for the moment.
git-svn-id: https://zxing.googlecode.com/svn/trunk@741 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 14:07:19 +00:00
srowen 65be5295c8 Remove Debug and switch to eceptions in Encoder / Writer API
git-svn-id: https://zxing.googlecode.com/svn/trunk@740 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-20 12:26:20 +00:00
dswitkin 8a018c8af8 Changed the Writer interface to provide contents as a String instead of a byte array.
git-svn-id: https://zxing.googlecode.com/svn/trunk@738 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 20:12:38 +00:00
dswitkin e7dfffc3d0 Fixed more unit tests.
git-svn-id: https://zxing.googlecode.com/svn/trunk@737 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 19:16:16 +00:00
dswitkin a13d3ca04d Fixed testIsValidKanjiSequence(). Looks like the data arrays got copied over wrong from the C++ hex strings.
git-svn-id: https://zxing.googlecode.com/svn/trunk@736 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 18:55:28 +00:00
dswitkin bbfd2639d3 Deleted a big honking polynomial table that was unused, and a related class.
git-svn-id: https://zxing.googlecode.com/svn/trunk@735 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 18:50:51 +00:00
dswitkin fb840a56ca Did some optimization and cleanup.
git-svn-id: https://zxing.googlecode.com/svn/trunk@734 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 18:35:10 +00:00
dswitkin a9b0be8b93 Added the quiet zone to the QRCodeWriter.
git-svn-id: https://zxing.googlecode.com/svn/trunk@733 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 16:39:59 +00:00
dswitkin 549771b3de Fixed testInterleaveWithECBytes().
git-svn-id: https://zxing.googlecode.com/svn/trunk@732 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 16:04:48 +00:00
dswitkin dbe7f8aa85 Fixed two more tests.
git-svn-id: https://zxing.googlecode.com/svn/trunk@731 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 15:51:44 +00:00
srowen 0a1a550a0f Corrected logic to handle case where remainder polynomial has leading 0 coefficients.
git-svn-id: https://zxing.googlecode.com/svn/trunk@730 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 12:39:18 +00:00
ccmysen a16d3ba6ef Changes to the matrix and debug classes to make some tests pass.
I'm not super happy about making LOG_INFO a noop, but I don't know the general
solution off hand.

In any case, MatrixUtilTestCase and MaskUtilTestCase both pass now.


git-svn-id: https://zxing.googlecode.com/svn/trunk@729 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 09:26:54 +00:00
dswitkin 581464ad21 Fixed a bunch more tests, and commented out all of the Renderer tests for now so everything compiles.
Sean, try commenting out testEncode(). It'll let you run a bit further to see a genuine problem that testInterleaveWithECBytes() finds.

git-svn-id: https://zxing.googlecode.com/svn/trunk@728 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-19 01:58:31 +00:00
dswitkin bafe58d06e Moved ByteArray up to core/common now that it has no dependencies on qrcode/encoder.
git-svn-id: https://zxing.googlecode.com/svn/trunk@727 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-18 23:01:42 +00:00
dswitkin c95fe48a76 Made several good fixes to and because of the unit tests. Turns out the EC array was never being set to the right size. I've now established that the Reed Solomon code is generating one fewer coefficient than the layer above it asked for.
git-svn-id: https://zxing.googlecode.com/svn/trunk@726 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-18 22:54:04 +00:00
dswitkin b5dbec4469 Created a WriterException class and updated a bunch of documentation.
git-svn-id: https://zxing.googlecode.com/svn/trunk@725 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-18 21:46:24 +00:00
dswitkin 1357c87441 Made some incremental progress on the Encoder unit test. I think we've now hit the first real bug in the code.
git-svn-id: https://zxing.googlecode.com/svn/trunk@724 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-18 21:34:17 +00:00
srowen 4883f8cd11 Finally submit tiny change to comments here
git-svn-id: https://zxing.googlecode.com/svn/trunk@722 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-18 21:18:10 +00:00
srowen 604a10e8e5 Replace IllegalStateException; still want to make it WriterException
git-svn-id: https://zxing.googlecode.com/svn/trunk@721 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-18 21:15:30 +00:00
dswitkin 919958c40f Made a small change to allow discovery of multiple email addresses within a Docomo MECARD.
git-svn-id: https://zxing.googlecode.com/svn/trunk@720 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-18 19:44:25 +00:00
ccmysen 559c79e1cc Adding in the rest of the qrcode test cases.
Most of them seem to be having run errors right now, but most of the major
syntax errors are now gone. The main missing feature right now is the use of
the GaloisField polynomial and a working Renderer class.



git-svn-id: https://zxing.googlecode.com/svn/trunk@719 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-18 18:56:19 +00:00
ccmysen e14607e785 Add testdata for the qrcode encoder tests (mainly part of the renderer testcase).
git-svn-id: https://zxing.googlecode.com/svn/trunk@718 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-18 18:17:22 +00:00
dswitkin 83758391f7 My BitVector implementation was totally buggy. I rewrote a lot of it and ported the test case, which now passes.
Now I'm tracking down an assertion in Encoder.InterleaveWithECBytes().

git-svn-id: https://zxing.googlecode.com/svn/trunk@717 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-18 15:34:45 +00:00
dswitkin 8175e2cc25 Created the base Writer object for all barcode encoding, then wrote a QR Code version. A Writer encodes a series of raw bytes into a 2D greyscale bitmap, represented by a ByteArray. This seems like a better container than MonochromeBitmapSource, because we may want shades of grey when encoding future formats. The next step is to hook this up to the Android client.
git-svn-id: https://zxing.googlecode.com/svn/trunk@716 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-17 22:10:45 +00:00
dswitkin 8d79ad7085 Fixed the build.
git-svn-id: https://zxing.googlecode.com/svn/trunk@715 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-17 20:49:10 +00:00
srowen e9a29fb098 move to singleton ReaderException for a bit more performance
git-svn-id: https://zxing.googlecode.com/svn/trunk@714 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-17 17:56:31 +00:00
srowen be59e299dc Add a bit of a hack to better detect UTF-8 in the wild, versus ISO88591
git-svn-id: https://zxing.googlecode.com/svn/trunk@712 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-16 12:46:18 +00:00
srowen 4fcdac3ae7 Change assert to an exception since this facility would not be available in J2ME. I vote for removing use of Debug anyway.
git-svn-id: https://zxing.googlecode.com/svn/trunk@711 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-16 12:03:11 +00:00
srowen 247e7c95bb Now uses new Reed Solomon encoder code
git-svn-id: https://zxing.googlecode.com/svn/trunk@709 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-15 20:23:32 +00:00
srowen c5d81d76d1 Add to result the raw, but parsed, bytes of byte segments in 2D barcodes
git-svn-id: https://zxing.googlecode.com/svn/trunk@708 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-15 13:50:18 +00:00
srowen ce341d92aa Bug fix to unrandomization routine from sanfordsquires
git-svn-id: https://zxing.googlecode.com/svn/trunk@707 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-15 12:58:36 +00:00
srowen 62d9959a3c Remove my old email address from files. Might as well save spammers the trouble.
git-svn-id: https://zxing.googlecode.com/svn/trunk@706 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-15 00:07:25 +00:00
dswitkin aea12b5286 Wrote a new ByteArray class to replace StringPiece and fixed all uses of it. Also converted all uses of stl::string (which was being used as vector<unsigned char>) to ByteArray. Everything in the Encoder but the Reed Solomon related code compiles now.
ByteArray could certainly move up to the common package, although it currently has a dependency on BitVector. We'll have to figure out what to do with the latter first.

This is the first set of changes I've made which are error prone. They involved a lot of pointer conversion, signed/unsigned semantics, etc. These diffs may have clues for later bugs.

git-svn-id: https://zxing.googlecode.com/svn/trunk@705 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-14 21:51:26 +00:00
dswitkin fabdd40edf Huge progress on the Encoder. I'm down to StringPiece errors (that class hasn't been replaced yet) and a few nasty methods, which call into Reed Solomon (not done yet).
git-svn-id: https://zxing.googlecode.com/svn/trunk@704 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-14 18:43:54 +00:00
srowen f80cd1ff51 More enhancements to Reed-Solomon tests
git-svn-id: https://zxing.googlecode.com/svn/trunk@703 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-14 18:34:19 +00:00
dswitkin b625c6f7e5 Got MatrixUtil to compile, and refactored some methods out of it, and into Matrix where they belong.
git-svn-id: https://zxing.googlecode.com/svn/trunk@702 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-14 16:21:05 +00:00
dswitkin 97ffa36734 Did a bunch of comments cleanup.
git-svn-id: https://zxing.googlecode.com/svn/trunk@701 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-14 15:40:38 +00:00
srowen 7cae0d4cc9 Added Reed-Solomon encoder, suitable for QR Code encoding
git-svn-id: https://zxing.googlecode.com/svn/trunk@699 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-14 12:40:55 +00:00
dswitkin 5dba28fc86 Wrote a reasonable implementation of BitVector which now compiles.
git-svn-id: https://zxing.googlecode.com/svn/trunk@698 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-13 21:59:08 +00:00
dswitkin 6f4898c68f Wrote a Matrix class and fixed all uses of it, as well as other small fixes like StringBuffer. MaskUtil and QRCode now compile with no errors.
git-svn-id: https://zxing.googlecode.com/svn/trunk@697 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-13 21:18:56 +00:00
srowen 8666ac2f8f Comment out QR code encoder package for the moment
git-svn-id: https://zxing.googlecode.com/svn/trunk@696 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-13 19:08:25 +00:00
dswitkin 60f3af2607 Converted the Mode and ECLevel enums in QRCode.java.
git-svn-id: https://zxing.googlecode.com/svn/trunk@695 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-13 17:12:53 +00:00
dswitkin f50305895d Began porting the QR Code encoder from ChartServer to Java/ZXing. Some important comments are flagged with JAVAPORT. I've done the following so far:
- Created Java files with our headers, packages, etc.
- Converted includes to imports, or commented out the unresolved dependencies
- Merged all the .h and .cpp contents into Java classes
- Fixed most of the formatting
- Did all the simple transformations (bool, NULL, const, struct, string, ::, ->)
- Created a Debug class to handle all the asserts and logging
- Fixed about half of the static arrays
- Removed some pthread cruft

IMPORTANT:

- Please do not start hacking this code up as I'm going to keep making large changes to it. In particular, we need to leave the trailing underscores on member variables for now. Once everything is compiling with no errors, we can revisit stylistic issues.
- There will be a number of similar classes within the encoder and in the rest of ZXing. We should refactor those later (BitVector and BitArray come to mind). In the mean time, I want to get everything working and the tests passing before we do that.

git-svn-id: https://zxing.googlecode.com/svn/trunk@694 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-13 16:14:44 +00:00
dswitkin cd0ff37fdb Made a small change to the KDDI AU parsing code to handle pronunciation (aka Furigana) specifically.
git-svn-id: https://zxing.googlecode.com/svn/trunk@692 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-12 16:21:19 +00:00
srowen 977c2e38ca Updates from sanfordsquires to fix RS decoding for Datamatrix
git-svn-id: https://zxing.googlecode.com/svn/trunk@689 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-12 13:47:45 +00:00
srowen d56fb38427 Updates from sanfordsquires to fix RS decoding for Datamatrix
git-svn-id: https://zxing.googlecode.com/svn/trunk@688 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-12 12:59:47 +00:00
dswitkin e9a6e8e906 Added support for Furigana using the SOUND field in MECARD. AddressBookParsedResult now has a pronunciation field to represent this. I'm not aware of whether this is supported in other formats like VCARD, so they all pass null for now.
git-svn-id: https://zxing.googlecode.com/svn/trunk@686 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-11 16:31:27 +00:00
srowen ae46d12d21 Partially addressed Reed-Solomon decoding issue for Datamatrix, but not entirely. Still some small issue that prevents correcting as many errors as possible.
git-svn-id: https://zxing.googlecode.com/svn/trunk@680 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-09 16:22:43 +00:00
srowen 04f17f67a6 Made new array fields final
git-svn-id: https://zxing.googlecode.com/svn/trunk@679 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-09 16:20:15 +00:00
srowen 5f817c69b6 Address a small but clear bug in detector logic
git-svn-id: https://zxing.googlecode.com/svn/trunk@678 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-08 14:27:08 +00:00
srowen 41a386f04c Attempt to make encoding detection slightly more accurate -- rule out Shift_JIS in a few more cases
git-svn-id: https://zxing.googlecode.com/svn/trunk@677 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-08 14:25:36 +00:00
srowen 56644b1af2 Small additional error check in decoder
git-svn-id: https://zxing.googlecode.com/svn/trunk@674 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-06 19:14:48 +00:00
dswitkin c4a28fa4a7 Made some temporary changes to make throwing ReaderExceptions more efficient. Long term, we need to delete this class and change the decoders to return errors instead of throwing.
git-svn-id: https://zxing.googlecode.com/svn/trunk@669 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-05 19:16:27 +00:00
srowen e6e3472471 Renamed UPC result type to Product, and introduced an idea of 'product ID' and 'normalized product ID' to account for UPC-E, where the actual visible ID is different from what we may want to search for as a key. Updated clients to use this too.
git-svn-id: https://zxing.googlecode.com/svn/trunk@668 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-04 12:08:19 +00:00
dswitkin 1dc71920e9 Another round of optimization, focused on reusing arrays and small objects.
git-svn-id: https://zxing.googlecode.com/svn/trunk@665 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-02 16:07:36 +00:00
srowen 14e22bd443 Revamp the character encoding detection to use a more complicated but still crude algorithm that detects more Shift_JIS sequences correctly.
git-svn-id: https://zxing.googlecode.com/svn/trunk@664 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-02 12:22:33 +00:00
srowen 79d7b01e9e Updated qrcode-2 with corrected output for some Japanese-language results. Also standardized on UTF-8 encoding for test result files and enabled --dump_results for single-file case.
git-svn-id: https://zxing.googlecode.com/svn/trunk@663 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-02 11:06:20 +00:00
srowen 70732c334e Now more lenient in detecting Shift_JIS to detect more byte sequences as Shift_JIS
git-svn-id: https://zxing.googlecode.com/svn/trunk@662 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-02 10:30:09 +00:00
dswitkin a8b57c466d Discovered that our 1D Readers were being reallocated for every row scanned - yikes! I made them reusable across both rows and different scans. This saved 26 ms on the worst case rejection. We can now consistently reject any 240x240 image on Android in 150 ms or less, checking all 7 formats.
git-svn-id: https://zxing.googlecode.com/svn/trunk@661 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-01 02:31:05 +00:00
srowen 5a5987df88 Allow up to 3 superfluous bits at end of stream
git-svn-id: https://zxing.googlecode.com/svn/trunk@659 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-31 18:49:54 +00:00
dswitkin bf362ae853 Added 17 new, unusual QR Codes to the blackbox tests. We can decode the majority OK, but some of the contents are not agreeing with the golden results because of a text encoding issue.
git-svn-id: https://zxing.googlecode.com/svn/trunk@658 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-31 18:09:24 +00:00
dswitkin 8671371c59 Did a big refactoring on the MonochromeBitmapSource. I removed all the caching luminance calls and converted them to getting luminance data on demand. This saved another 33,000 function calls per rejected scan, good for another 15 ms savings. I also moved the luminance calls to BaseMonochromeBitmapSource and made them protected, to indicate that the decoders shouldn't use them.
Overall the recent optimizations took one rejected scan from 307 to 135 ms, which is definitely noticeable.

WARNING: I am not able to build the Bug or J2ME clients, but I believe they are correct.

git-svn-id: https://zxing.googlecode.com/svn/trunk@656 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-30 18:44:10 +00:00
dswitkin bef3c75048 Fixed a crash in calendar parsing when encountering an illegal VEVENT without newlines.
git-svn-id: https://zxing.googlecode.com/svn/trunk@655 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-30 16:35:26 +00:00
dswitkin 4f7b7d573d Made the data members of BitArray public so they will be inlined. This saves about 60,000 function calls per rejected scan. We can make these private again once we figure out the ProGuard problems with -allowaccessmodification.
git-svn-id: https://zxing.googlecode.com/svn/trunk@653 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-29 21:16:46 +00:00
dswitkin 77f41cce22 Added another target for building a debug key signed Android client, and removed the old optimized target from core.
git-svn-id: https://zxing.googlecode.com/svn/trunk@650 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-29 19:50:37 +00:00
srowen 6f6da9a04c moved ProGuard optimization into Android build file since it's the only way to fully optimize the final build product (inlining of key methods). Also always dump proguard results.
git-svn-id: https://zxing.googlecode.com/svn/trunk@649 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-29 15:42:22 +00:00
dswitkin d80cd07064 Made a change to the QR detector which cuts the worst case rejection time from 300 ms to 160 ms, with almost no penalty in decoding ability. Given that we're emphasizing continuous decoding, I feel it's much better to reject the occasional borderline image in half the time, and get on with the next scan.
git-svn-id: https://zxing.googlecode.com/svn/trunk@648 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-29 14:22:44 +00:00
srowen 78da6447b0 Inner class elements now not private since it is pointless and confuses Proguard
git-svn-id: https://zxing.googlecode.com/svn/trunk@647 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-28 15:59:51 +00:00
srowen 96f6428eea Add column caching to MonochromeBitmapSources and use it to improve Data Matrix speed
git-svn-id: https://zxing.googlecode.com/svn/trunk@631 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-22 08:43:56 +00:00
dswitkin f142a9478c Reordered the address book fields to something a little more standard/reasonable.
git-svn-id: https://zxing.googlecode.com/svn/trunk@623 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-17 20:21:29 +00:00
dswitkin 77d29c3d7a Added support for URL to MECARD and VCARD.
git-svn-id: https://zxing.googlecode.com/svn/trunk@622 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-17 16:12:10 +00:00
dswitkin 8cb804ec9e Made a change to 1D decoding which looks for 100% instead of 150% of the start and end patterns when searching for quiet zones, but in exchange for that reduction, we reject rows whose quiet zones would run off either edge of the image.
The result is complete elimination of all false positives in the new batch of 40 images I just checked in. Bettter than that, we come up with a net gain of 38 new barcodes decoded (counting rotation and try harder variations). We even get some of the reflective images that were impossible up to this point.

git-svn-id: https://zxing.googlecode.com/svn/trunk@620 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-15 19:47:34 +00:00
dswitkin edcf34f0c5 Created 40 new blackbox images which are partial shots of a very large QR code. In mobile mode we do OK, but in try harder we find bogus 1D results in almost half of these. I'm checking this in as a baseline, and will work on improving the situation in a subsequent change.
git-svn-id: https://zxing.googlecode.com/svn/trunk@618 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-14 22:08:48 +00:00
dswitkin c91f427a8b Added a bit of defensive programming in the AlignmentPattern code. There were real world examples where the width passed to AlignmentPatternFinder was zero, which causes BitArray to throw when built with a size of zero. I'm going a little bit farther and not searching extremely small areas either.
Sean, please review.

git-svn-id: https://zxing.googlecode.com/svn/trunk@617 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-14 18:24:23 +00:00
dswitkin ef2f3f8ce0 Expanded calendar parsing to allow more date formats, added some unit tests for ISBN and VEVENTS, and fixed the EAN13-1 test which was failing by one image.
git-svn-id: https://zxing.googlecode.com/svn/trunk@616 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-14 15:56:03 +00:00
dswitkin 7fe2c1c60c Prevented ISBN parsing from happening twice.
git-svn-id: https://zxing.googlecode.com/svn/trunk@610 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-09 18:46:21 +00:00
srowen 83c01f0cee Camel-cased log_table, exp_table vars
git-svn-id: https://zxing.googlecode.com/svn/trunk@609 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-09 12:17:37 +00:00
mschulkind 76b4fa1910 Fixing a comment.
git-svn-id: https://zxing.googlecode.com/svn/trunk@607 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-08 20:52:58 +00:00
mschulkind af555d2409 Renaming two member variables so they no longer share names with their getters.
git-svn-id: https://zxing.googlecode.com/svn/trunk@606 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-08 20:42:04 +00:00
dswitkin 45677f2bb2 Made calendar event parsing more robust, and also reject non-calendar contents a little faster.
git-svn-id: https://zxing.googlecode.com/svn/trunk@604 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-08 15:37:38 +00:00
dswitkin 13c08aedaf Added 13 new blackbox images.
git-svn-id: https://zxing.googlecode.com/svn/trunk@603 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-07 18:57:15 +00:00
srowen 773409ed6a Add check for minimal whitespace before/after Code 128, Code 39; a few code tweaks as well
git-svn-id: https://zxing.googlecode.com/svn/trunk@601 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-07 09:53:53 +00:00
srowen 089df8eb7b Added redundant abstract method declarations to maybe work around problems on Nokias
git-svn-id: https://zxing.googlecode.com/svn/trunk@600 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-06 11:43:19 +00:00
srowen b0b0afc172 Added redundant abstract method declarations to maybe work around problems on Nokias
git-svn-id: https://zxing.googlecode.com/svn/trunk@599 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-04 14:46:15 +00:00
srowen 8c3b727bd4 Recent bug fix uncovered some bugs in test case -- fixing those
git-svn-id: https://zxing.googlecode.com/svn/trunk@594 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-01 16:17:03 +00:00
dswitkin 16bdeac581 Added two more UPC-A blackbox images submitted by the community.
git-svn-id: https://zxing.googlecode.com/svn/trunk@593 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-01 14:17:17 +00:00
dswitkin bacd1469af - Fixed a crash when parsing a particular VCard with a blank entry.
- Trimmed whitespace around many fields to sanitize the results (this is very useful upstream, for example we hyphenate phone numbers on Android but can't tolerate extra whitespace).
- Fixed a bug with 1D result points when scanning upside down - they needed to be mirrored to draw correctly.

git-svn-id: https://zxing.googlecode.com/svn/trunk@592 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-09-29 18:45:00 +00:00
srowen 6db50e0b79 Finally actually fix the Code-128 bug and add tests
git-svn-id: https://zxing.googlecode.com/svn/trunk@588 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-09-24 12:16:41 +00:00
srowen 78af16ca34 More UPC-A tests: interesting clear but low-res images that don't decode
git-svn-id: https://zxing.googlecode.com/svn/trunk@587 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-09-23 17:24:03 +00:00
srowen e2b141e1a3 Another fix -- account for CODE_STOP. Add some comments.
git-svn-id: https://zxing.googlecode.com/svn/trunk@585 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-09-22 09:08:57 +00:00
srowen b29b4d2070 Fix bug that would cut out part of result string if final checksum value happened to be the code for a non-printable character
git-svn-id: https://zxing.googlecode.com/svn/trunk@584 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-09-21 11:14:48 +00:00
dswitkin 1ab0f14f41 Made a couple utility methods public.
git-svn-id: https://zxing.googlecode.com/svn/trunk@582 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-09-19 01:10:25 +00:00