mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-11 05:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
988 commits 6 branches 32 tags 331 MiB
Commit graph

988 commits

This branch
This branch
All branches
Author SHA1 Message Date
dswitkin f59ed95541 Merged revisions 321,327,330,332,334,342-343,352-353,355-358,361-363,365,372 via svnmerge from 
https://zxing.googlecode.com/svn/trunk/android-m3

........
  r321 | srowen | 2008-03-28 09:57:55 -0700 (Fri, 28 Mar 2008) | 1 line
  
  Updates for 0.6; set aside a different android-m3-home variable for android-m3 build
........
  r327 | srowen | 2008-03-31 12:04:38 -0700 (Mon, 31 Mar 2008) | 1 line
  
  Made the RGB to luminance approximation/optimization a little faster -- one less shift
........
  r330 | dswitkin | 2008-03-31 13:55:38 -0700 (Mon, 31 Mar 2008) | 1 line
  
  Changed the project names for the two Android clients to disambiguate them.
........
  r332 | dswitkin | 2008-04-01 09:11:36 -0700 (Tue, 01 Apr 2008) | 1 line
  
  Added some debugging features to the M3 Android client. You can now press 'C' to capture a photo, 'U' to decode only UPC/1D barcodes, and 'Q' to decode only QR Codes.
........
  r334 | dswitkin | 2008-04-01 12:23:05 -0700 (Tue, 01 Apr 2008) | 1 line
  
  Added latency measurement in milliseconds to the Android client.
........
  r342 | dswitkin | 2008-04-03 14:13:50 -0700 (Thu, 03 Apr 2008) | 1 line
  
  Improved the Android M3 viewfinder display, by making the framing box larger and zooming in. Also fixed a bug when restarting the activity where the camera params were stale. Fixed handling of geo and tel URIs.
........
  r343 | srowen | 2008-04-03 15:18:16 -0700 (Thu, 03 Apr 2008) | 1 line
  
  Moved the "geo:" fix to the 'right' place
........
  r352 | dswitkin | 2008-04-08 08:25:13 -0700 (Tue, 08 Apr 2008) | 1 line
  
  Rewrote the Android M3 client to do continuous decoding, which means you no longer have to push the shutter button. Now you can just place the barcode in the viewfinder and it will display the contents as soon as it decodes them. That also means you no longer get "barcode not found" error dialogs which is a big improvement. Also made sure that capturing debug JPEGs uses unique filenames.
........
  r353 | dswitkin | 2008-04-08 09:06:13 -0700 (Tue, 08 Apr 2008) | 1 line
  
  Improved the CameraThread state machine, and fixed a bug where preview would not continue after capture.
........
  r355 | dswitkin | 2008-04-10 13:57:37 -0700 (Thu, 10 Apr 2008) | 1 line
  
  Made sure the BitmapSource subclasses do not reuse a BitArray which is too small.
........
  r356 | dswitkin | 2008-04-11 12:30:54 -0700 (Fri, 11 Apr 2008) | 1 line
  
  Changed ProGuard settings so it will inline methods which use private members. This eliminates tens of thousands of function calls to BitArray.get() on a typical decode, and lots of other work as well. Overall we're roughly 20% faster by using ProGuard than turning it off.
........
  r357 | dswitkin | 2008-04-11 13:25:09 -0700 (Fri, 11 Apr 2008) | 1 line
  
  Made the worker threads shut down synchronously to fix a race condition where the CameraManager could close the camera driver too soon.
........
  r358 | dswitkin | 2008-04-11 14:16:08 -0700 (Fri, 11 Apr 2008) | 1 line
  
  Added 'T' as a shortcut to toggle debug method tracing using android.os.Debug and traceview for analysis. The traces are written to /sdcard, which means the SD Card must not be mounted as a volume by USB at the time. Tracing can slow down decoding by a factor of 5 or more but gives very useful insights into where the time is going.
........
  r361 | dswitkin | 2008-04-15 15:34:49 -0700 (Tue, 15 Apr 2008) | 1 line
  
  A couple small improvements to the CameraManager.
........
  r362 | srowen | 2008-04-15 17:27:36 -0700 (Tue, 15 Apr 2008) | 1 line
  
  Small simplification of build file condition properties using else attribute
........
  r363 | srowen | 2008-04-15 17:34:13 -0700 (Tue, 15 Apr 2008) | 1 line
  
  Fix Issue 50, not building on Windows, by adding some small workarounds for Windows paths in build files for Android
........
  r365 | dswitkin | 2008-04-17 13:09:17 -0700 (Thu, 17 Apr 2008) | 1 line
  
  Converted the Android client to use a status bar on the bottom of the screen instead of dialogs for a much better, less interrupting user experience.
........
  r372 | dswitkin | 2008-04-21 11:11:02 -0700 (Mon, 21 Apr 2008) | 1 line
  
  Added some simple sharpening for 1D decoding which allowed a couple more blackbox images to pass. There were a few cases where the format or content is now misdetected, but since the net gain was positive I decided to make those non-fatal errors. In real world use the sharpening seems to help, and I think we can do even better with a better algorithm.
........


git-svn-id: https://zxing.googlecode.com/svn/trunk@374 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-21 22:44:40 +00:00
dswitkin 0e314f610d Initialized merge tracking via "svnmerge" with revisions "1-319" from 
https://zxing.googlecode.com/svn/trunk/android-m3


git-svn-id: https://zxing.googlecode.com/svn/trunk@373 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-21 19:58:44 +00:00
dswitkin 0987663963 Added some simple sharpening for 1D decoding which allowed a couple more blackbox images to pass. There were a few cases where the format or content is now misdetected, but since the net gain was positive I decided to make those non-fatal errors. In real world use the sharpening seems to help, and I think we can do even better with a better algorithm. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@372 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-21 18:11:02 +00:00
dswitkin 5079f361ac Improved the command line test app to accept multiple arguments, a --try_harder flag, and to skip hidden files and text files. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@371 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-21 14:43:32 +00:00
dswitkin a69a87e98d Replaced the smaller, resized EAN13-2 test images with the full-size originals. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@370 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-19 18:38:52 +00:00
srowen df25fc1389 Separate out test-unit and test-blackbox targets for running different sorts of tests 
git-svn-id: https://zxing.googlecode.com/svn/trunk@369 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-18 17:03:04 +00:00
dswitkin 9eceb0593e Added a new test library of 16 blurry EAN-13 barcodes. Currently we cannot decode any of them. I'm checking these in as a baseline so we can evaluate various sharpening techniques. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@368 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-18 15:51:39 +00:00
dswitkin a2662ebb40 Changed the black box tests to require an absolute number of images to decode successfully, instead of a percentage, and set the high water mark for each test. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@367 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-18 14:43:56 +00:00
dswitkin a816d5d9b1 Changed the parsing logic to refer to EAN-8 and EAN-13 as UPCs as well, so that the clients can recognize them as product barcodes and offer to do a product search. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@366 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-18 14:30:02 +00:00
dswitkin cd7c4d21ac Converted the Android client to use a status bar on the bottom of the screen instead of dialogs for a much better, less interrupting user experience. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@365 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-17 20:09:17 +00:00
srowen 989dc395f0 Added workaround for NoSuchMethodError on some Nokia JVMs with a superfluous abstract method (thanks Marnix) 
git-svn-id: https://zxing.googlecode.com/svn/trunk@364 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-16 00:38:54 +00:00
srowen aa5cdcb64b Fix Issue 50, not building on Windows, by adding some small workarounds for Windows paths in build files for Android 
git-svn-id: https://zxing.googlecode.com/svn/trunk@363 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-16 00:34:13 +00:00
srowen d2a240220c Small simplification of build file condition properties using else attribute 
git-svn-id: https://zxing.googlecode.com/svn/trunk@362 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-16 00:27:36 +00:00
dswitkin 5c496574a3 A couple small improvements to the CameraManager. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@361 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-15 22:34:49 +00:00
dswitkin 66ae9f7ed4 Added 'T' as a shortcut to toggle debug method tracing using android.os.Debug and traceview for analysis. The traces are written to /sdcard, which means the SD Card must not be mounted as a volume by USB at the time. Tracing can slow down decoding by a factor of 5 or more but gives very useful insights into where the time is going. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@358 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-11 21:16:08 +00:00
dswitkin 4c10031a67 Made the worker threads shut down synchronously to fix a race condition where the CameraManager could close the camera driver too soon. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@357 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-11 20:25:09 +00:00
dswitkin e14defda5f Changed ProGuard settings so it will inline methods which use private members. This eliminates tens of thousands of function calls to BitArray.get() on a typical decode, and lots of other work as well. Overall we're roughly 20% faster by using ProGuard than turning it off. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@356 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-11 19:30:54 +00:00
dswitkin 0b7bface5b Made sure the BitmapSource subclasses do not reuse a BitArray which is too small. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@355 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-10 20:57:37 +00:00
dswitkin ae54d7a937 Changed how many rows we scan while detecting QR finder patterns. The mobile case dynamically calculates this based on the height of the image, and ranges from a small speedup to a big difference for large inputs. Also changed the try harder case to scan every 3rd line for a 3x speedup. The unit tests have the same success rate as before: 16/20 on qr1, 10/10 on qr2. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@354 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-10 20:26:42 +00:00
dswitkin d9fc77b9e2 Improved the CameraThread state machine, and fixed a bug where preview would not continue after capture. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@353 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-08 16:06:13 +00:00
dswitkin e9ed806d30 Rewrote the Android M3 client to do continuous decoding, which means you no longer have to push the shutter button. Now you can just place the barcode in the viewfinder and it will display the contents as soon as it decodes them. That also means you no longer get "barcode not found" error dialogs which is a big improvement. Also made sure that capturing debug JPEGs uses unique filenames. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@352 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-08 15:25:13 +00:00
srowen 1c9b906442 Workaround for codes that fail to include (required) final TERMINATOR mode indicator 
git-svn-id: https://zxing.googlecode.com/svn/trunk@351 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-07 22:05:40 +00:00
srowen 19dbe047fd Oops, off-by-one bug fix, and some more comments 
git-svn-id: https://zxing.googlecode.com/svn/trunk@350 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-07 20:32:17 +00:00
srowen 5659a711a2 Can now instantiate this to represent a region of a BufferedImage rather than the whole thing. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@349 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-07 20:05:11 +00:00
srowen a5b385e764 Standardize array initializer syntax to use the form without "new type[]", to be consistent and make translation to C++ easier 
git-svn-id: https://zxing.googlecode.com/svn/trunk@348 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-07 19:42:35 +00:00
srowen 9c1b4a1393 Make two methods public for easier reuse by third-party implementaitons 
git-svn-id: https://zxing.googlecode.com/svn/trunk@345 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-04 16:34:42 +00:00
srowen 32d92ca3a9 Forward-porting Daniel's fix 
git-svn-id: https://zxing.googlecode.com/svn/trunk@344 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-03 22:43:56 +00:00
srowen 5f25bd00a3 Moved the "geo:" fix to the 'right' place 
git-svn-id: https://zxing.googlecode.com/svn/trunk@343 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-03 22:18:16 +00:00
dswitkin 6f4417346c Improved the Android M3 viewfinder display, by making the framing box larger and zooming in. Also fixed a bug when restarting the activity where the camera params were stale. Fixed handling of geo and tel URIs. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@342 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-03 21:13:50 +00:00
mschulkind 87da7e9226 small typo fix. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@341 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-03 20:34:30 +00:00
srowen d1d7e96238 At last, removing SKIP_N_BARCODES and separating this logic out in a way that individual projects can implement it on their own. It's a bit too onerous and project-specific to live on in the main code. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@340 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-03 16:39:44 +00:00
srowen 28ea8e02f0 Parsing wasn't correctly ignoring the ':' in prefix! 
git-svn-id: https://zxing.googlecode.com/svn/trunk@339 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-03 16:12:08 +00:00
srowen 0e7872020c Another fix to ensure that 2 barcodes with the same info are counted separately. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@338 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-03 15:39:06 +00:00
srowen 01075819c5 "Skip 0 barcodes" was incorrectly not returning the first barcode found 
git-svn-id: https://zxing.googlecode.com/svn/trunk@337 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-02 14:03:02 +00:00
srowen 012a8c0ce7 Fixed same ResultPoint bug in Code 128 and Code 39 reader; added convenient toString() to Result and GenericResultPoint; added arg checking for Result constructor too 
git-svn-id: https://zxing.googlecode.com/svn/trunk@336 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-02 13:40:29 +00:00
dswitkin f299f413e0 Fixed the result points for 1D decoding so that we once again get a green line in the Android client across the successful row. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@335 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-01 21:23:14 +00:00
dswitkin 0e2defcf66 Added latency measurement in milliseconds to the Android client. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@334 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-01 19:23:05 +00:00
dswitkin 410b5b4e92 Improved the statistics reporting for the CommandLineRunner. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@333 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-01 18:30:38 +00:00
dswitkin 14a200b546 Added some debugging features to the M3 Android client. You can now press 'C' to capture a photo, 'U' to decode only UPC/1D barcodes, and 'Q' to decode only QR Codes. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@332 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-04-01 16:11:36 +00:00
dswitkin 4b0927626f Changed the project names for the two Android clients to disambiguate them. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@330 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-31 20:55:38 +00:00
srowen 11fc234d76 Completed basic support for NFC / NDEF formats applicable to 2D barcodes. Not yet enabled. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@329 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-31 20:51:24 +00:00
dswitkin 87f79c076c Removed @Override from Tom's code, which gave errors in 1.5 because they referred to an interface instead of a base class. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@328 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-31 19:49:08 +00:00
srowen 93db610970 Made the RGB to luminance approximation/optimization a little faster -- one less shift 
git-svn-id: https://zxing.googlecode.com/svn/trunk@327 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-31 19:04:38 +00:00
srowen 5cfa58629c Tiny improvement -- 'clean' target should remove generated javadoc 
git-svn-id: https://zxing.googlecode.com/svn/trunk@322 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-28 17:04:48 +00:00
srowen 352cd6c981 Updates for 0.6; set aside a different android-m3-home variable for android-m3 build 
git-svn-id: https://zxing.googlecode.com/svn/trunk@321 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-28 16:57:55 +00:00
srowen 10ce9dde67 Updates to build on M5 
git-svn-id: https://zxing.googlecode.com/svn/trunk@320 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-28 16:54:29 +00:00
dswitkin 0198f58150 Branching the current Android client into an M3 directory so we can proceed with M5 development. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@319 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-28 15:25:18 +00:00
srowen 683a78256d Improved bounds-checking and point-nudging logic in GridSampler. We should check more than endpoints. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@317 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-26 17:01:13 +00:00
srowen 4473c00147 Restored a corrected Reed-Solomon optimization and fixed a small issue in black box test cases 
git-svn-id: https://zxing.googlecode.com/svn/trunk@316 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-26 16:22:02 +00:00
srowen c465263306 A few refactorings in anticipation of more formats that needs some common functionality 
git-svn-id: https://zxing.googlecode.com/svn/trunk@315 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-03-26 14:46:57 +00:00