Commit graph

412 commits

Author SHA1 Message Date
srowen aa65741586 More refactoring of parsed results / result parsers; added basic vCard support
git-svn-id: https://zxing.googlecode.com/svn/trunk@487 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-27 17:50:47 +00:00
srowen c9018b1bd2 Take advantage of new parsed result fields in Android client
git-svn-id: https://zxing.googlecode.com/svn/trunk@484 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-26 20:20:27 +00:00
srowen 011e6e9cee Big refactoring of ParsedResult: now split into ResultParser and ParsedResult classes, per Christian's suggestion. This unifies the parsed results that are produced from various input, simplifying client handling of different types.
git-svn-id: https://zxing.googlecode.com/svn/trunk@482 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-26 19:49:38 +00:00
srowen e0db8f9271 Standardize and update all copyright statements to name "ZXing authors" as suggested by open-source team to correctly attribute copyright in a project with contributions from several sources.
git-svn-id: https://zxing.googlecode.com/svn/trunk@455 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-19 20:56:24 +00:00
dswitkin 9adb83bbd3 Refactored the MonochromeBitmapSource hierarchy to share a great deal of code and shrink the derived classes considerably.
git-svn-id: https://zxing.googlecode.com/svn/trunk@418 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-11 23:52:35 +00:00
srowen f5b58916c1 Fix bad logic black point estimator, improving threshold estimation performance (and adjust some == to .equals())
git-svn-id: https://zxing.googlecode.com/svn/trunk@417 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-11 19:59:38 +00:00
srowen a73fc5919a Added SMSTO support, added subject/body param support in mailto:, improved handling of mailto: and tel: URIs
git-svn-id: https://zxing.googlecode.com/svn/trunk@402 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-23 22:40:13 +00:00
dswitkin 6291508a2e Merged revisions 378,380,382 via svnmerge from
https://zxing.googlecode.com/svn/trunk/android-m3

........
  r378 | dswitkin | 2008-04-28 21:27:27 -0400 (Mon, 28 Apr 2008) | 4 lines
  
  - Added Joseph's excellent supermarket checkout beep. There seems to be a bug in the M3 framework where it sometimes plays twice or hiccups.
  - Changed the status bar to flash green for a second when the result points are drawn.
  - Added install as a target to the build file.
  - Fixed a crashing bug when decoding from preview mode (driver problem).
........
  r380 | srowen | 2008-05-02 14:39:03 -0400 (Fri, 02 May 2008) | 2 lines
  
  Added preliminary support for MobileTag formats; not enabled yet.
  Added "sms:" URI support.
........
  r382 | srowen | 2008-05-02 15:18:14 -0400 (Fri, 02 May 2008) | 1 line
  
  Many more little tweaks from IntelliJ inspections
........


git-svn-id: https://zxing.googlecode.com/svn/trunk@384 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-03 16:10:16 +00:00
srowen 635d904283 Many more little tweaks from IntelliJ inspections
git-svn-id: https://zxing.googlecode.com/svn/trunk@382 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-02 19:18:14 +00:00
srowen dee32b1323 Fix typo introduced at the last second before commit. Watch that 'a' key!
git-svn-id: https://zxing.googlecode.com/svn/trunk@381 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-02 18:41:05 +00:00
srowen 188c7fbecb Added preliminary support for MobileTag formats; not enabled yet.
Added "sms:" URI support.

git-svn-id: https://zxing.googlecode.com/svn/trunk@380 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-02 18:39:03 +00:00
dswitkin 1d2f419d38 Fixed a typo in the Android build file.
git-svn-id: https://zxing.googlecode.com/svn/trunk@375 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-04-21 23:16:48 +00:00
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
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 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
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
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
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 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
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 e97b55f884 Removed old YUV-based implementation
git-svn-id: https://zxing.googlecode.com/svn/trunk@314 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-26 14:43:42 +00:00
srowen 7de539a67c biasTowardsWhite was, embarassingly, not accomplishing anything mathematically. It proved to not have much value so has been removed, to simplify the code.
git-svn-id: https://zxing.googlecode.com/svn/trunk@313 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-26 14:42:33 +00:00
srowen c32827af04 More aggressive inlining, to inline some key methods like BitArray.get(), resulting in significant performance boost
git-svn-id: https://zxing.googlecode.com/svn/trunk@311 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-25 18:23:49 +00:00
srowen b88df41dca More aggressive ProGuard optimization
git-svn-id: https://zxing.googlecode.com/svn/trunk@307 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-21 12:46:00 +00:00
srowen 91e3968774 Automatically inserts version number in strings.xml now
git-svn-id: https://zxing.googlecode.com/svn/trunk@303 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-19 20:23:27 +00:00
srowen 8c105d8fc4 Automatically inserts version number in strings.xml now
git-svn-id: https://zxing.googlecode.com/svn/trunk@302 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-19 20:23:10 +00:00
srowen 76757bdcd4 More proper support for geo: URLs in Android
git-svn-id: https://zxing.googlecode.com/svn/trunk@301 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-19 20:18:28 +00:00
srowen 14a9eb7d20 Fixed bug in rotation code for BufferedImageMonochromeBitmapSource; fixed "SKIP_N_BARCODES" behavior to ignore barcodes already found.
git-svn-id: https://zxing.googlecode.com/svn/trunk@297 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-19 17:09:27 +00:00
srowen 7214289cf0 Oops, use 5 passes of optimization
git-svn-id: https://zxing.googlecode.com/svn/trunk@294 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-18 16:56:12 +00:00
srowen 379c3a8cc0 Add support for tel: URIs
git-svn-id: https://zxing.googlecode.com/svn/trunk@292 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-17 20:17:20 +00:00
srowen cc06bc326b Fixed naming convention. Everything should be a "ParsedResult"
git-svn-id: https://zxing.googlecode.com/svn/trunk@289 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-17 18:24:26 +00:00
srowen c3b3254cf6 Some refactoring to remove small disconnect between how Results are handled and whether the client thinks it can do anything meaningful with a Result
git-svn-id: https://zxing.googlecode.com/svn/trunk@288 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-17 18:12:00 +00:00
srowen b18107391b Nope, disable link from geo: URL to Google Maps. Does not quite work in the browser yet.
git-svn-id: https://zxing.googlecode.com/svn/trunk@287 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-17 16:50:03 +00:00
srowen 444ec0b00f Add client support for geo URIs
git-svn-id: https://zxing.googlecode.com/svn/trunk@285 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-17 15:16:59 +00:00
srowen 34cc1d2b9d Move GridSampler into common package and refactor to ready it for use with Data Matrix
git-svn-id: https://zxing.googlecode.com/svn/trunk@278 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-14 18:44:41 +00:00
srowen ea13f8b052 Refactorings to allow raw bytes to be passed back with reader result, where applicable
git-svn-id: https://zxing.googlecode.com/svn/trunk@270 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-12 18:51:46 +00:00
srowen c6b6bfb332 Deprecated YUV version
git-svn-id: https://zxing.googlecode.com/svn/trunk@263 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-10 21:36:12 +00:00
srowen 5f8beb71c6 Switch to RGB-based captures for decoding, in preparation for move to continuous scan model
git-svn-id: https://zxing.googlecode.com/svn/trunk@262 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-10 21:31:47 +00:00
srowen 5f867e7b0d Fixed handling of new Android Intent result
git-svn-id: https://zxing.googlecode.com/svn/trunk@261 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-10 21:23:58 +00:00
srowen 024c46b18e Just addin' copyright comments
git-svn-id: https://zxing.googlecode.com/svn/trunk@252 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-06 21:11:45 +00:00
srowen 3ee4cb2b66 Add support for Android Intent URIs encoded in a barcode
git-svn-id: https://zxing.googlecode.com/svn/trunk@250 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-06 16:01:15 +00:00
srowen f7306489b6 Now supports KDDI/AU / Softbank address book format
git-svn-id: https://zxing.googlecode.com/svn/trunk@249 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-06 15:43:31 +00:00
srowen a78f7f40d5 Various code tweaks and refactorings suggested by IntelliJ
git-svn-id: https://zxing.googlecode.com/svn/trunk@246 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-05 17:26:44 +00:00
srowen f79bb97605 Don't like using == instead of equals() here, even though it's valid here. Fixed that.
git-svn-id: https://zxing.googlecode.com/svn/trunk@240 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-03 22:07:43 +00:00
srowen 905b1f7676 Fix typo in method "isRotate*d*Supported"; don't attempt to rotate images of unknown format
git-svn-id: https://zxing.googlecode.com/svn/trunk@238 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-03 21:36:03 +00:00
srowen c4ee6727d6 Use TRY_HARDER hint in javase CommandLineRunner. TRY_HARDER now tries rotating the image when dealing with 1D barcodes. Clarified and fixed value type of several items in the "hints" Hashtables.
git-svn-id: https://zxing.googlecode.com/svn/trunk@235 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-03 19:48:08 +00:00
srowen 848609c0c5 Added "URLTO" format support
git-svn-id: https://zxing.googlecode.com/svn/trunk@229 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-25 22:15:36 +00:00
srowen 759bef6f8a More little tweaks to make the 'release' build target happy again
git-svn-id: https://zxing.googlecode.com/svn/trunk@227 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-22 19:32:35 +00:00
srowen e8553801b1 Now can use "-Ddebug=true" on the command line to build a non-optimized build with debug symbols. Also added check for ProGuard.
git-svn-id: https://zxing.googlecode.com/svn/trunk@222 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-22 18:13:00 +00:00
srowen 556225ab0a Improved GridSampler API -- no need for reflection anymore. Reintroduced Android GridSampler implementation, which still doesn't quite work yet.
git-svn-id: https://zxing.googlecode.com/svn/trunk@221 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-22 17:01:38 +00:00
srowen 47743fbb8e Oh and made a constant field final
git-svn-id: https://zxing.googlecode.com/svn/trunk@219 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-21 16:37:51 +00:00
srowen 08aa759c07 Now calls setSizeFromLayout() rather than fixed to a 320x240 size
git-svn-id: https://zxing.googlecode.com/svn/trunk@218 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-21 16:37:06 +00:00
srowen 2110c3fbdd Added ProGuard
git-svn-id: https://zxing.googlecode.com/svn/trunk@217 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-21 16:36:27 +00:00
srowen 848f791d4f Replaced busy wait with wait()/notifyAll() idiom
git-svn-id: https://zxing.googlecode.com/svn/trunk@206 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-15 17:51:43 +00:00
srowen 4c4adc953e Brought this back into sync with BufferedImageMonochromeBitmapSource
git-svn-id: https://zxing.googlecode.com/svn/trunk@205 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-15 17:51:11 +00:00
srowen e7cdb0ca25 Include android in main build; add android clean target
git-svn-id: https://zxing.googlecode.com/svn/trunk@194 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-14 21:06:57 +00:00
srowen eb2fa80eaf Biiig standardization of whitespace. 2 space indents now, no tabs.
git-svn-id: https://zxing.googlecode.com/svn/trunk@191 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-14 20:25:54 +00:00
srowen c36a3b64cc Added android build.xml file
git-svn-id: https://zxing.googlecode.com/svn/trunk@190 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-14 20:21:33 +00:00
srowen 3f3c2fd7e5 More minor javadoc, code tweaks
git-svn-id: https://zxing.googlecode.com/svn/trunk@189 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-14 20:05:31 +00:00
dswitkin 1ca6c123d4 This is the first version of the ZXing Android client.
git-svn-id: https://zxing.googlecode.com/svn/trunk@185 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-14 19:02:18 +00:00