Commit graph

82 commits

Author SHA1 Message Date
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 ef7c421a66 Fixed Search Book Contents when built under ProGuard.
git-svn-id: https://zxing.googlecode.com/svn/trunk@667 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-03 16:13:56 +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 1d8b533310 Fixed the Android client when using ProGuard. The ViewfinderView constructor is loaded dynamically by the XML view inflation code, which requires explicitly preserving it.
git-svn-id: https://zxing.googlecode.com/svn/trunk@654 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-30 15:41:52 +00:00
dswitkin 43e155804f Looks like -allowaccessmodification to ProGuard results in a bogus binary. It compiles, but the Dalvik verifier rejects it at runtime. I'm removing this flag for now, which means we lose inlining on some important getters and setters.
git-svn-id: https://zxing.googlecode.com/svn/trunk@652 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-29 20:38:33 +00:00
dswitkin 1e478df248 Added androidtest to the top-level clean target and set it up for ProGuard too. Made both Android builds depend on clean so they work when switching between normal and ProGuard builds, and made install and reinstall use the latest binary instead of recompiling.
git-svn-id: https://zxing.googlecode.com/svn/trunk@651 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-29 20:13:05 +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 fd9ecdac96 Added support for a title when searching for an address, for example a business name. Also changed snipppets --> snippet in book search.
git-svn-id: https://zxing.googlecode.com/svn/trunk@635 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-23 18:34:35 +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 c14dbc8381 Added versionName and versionCode to the Android client manifest.
git-svn-id: https://zxing.googlecode.com/svn/trunk@626 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-18 19:27:43 +00:00
dswitkin 35115ce1f3 The new Android client, featuring:
- a completely new result UI with multiple actions per barcode
- Search Book Contents, powered by Google Book Search
- support for calendar events
- support for URLs and addresses in contact info
- many other small improvements, like making URLs hyperlinked

git-svn-id: https://zxing.googlecode.com/svn/trunk@625 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-18 16:23:24 +00:00
dswitkin f3123f432b Removed the old Android client in preparation for the new one.
git-svn-id: https://zxing.googlecode.com/svn/trunk@624 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-18 13:31:08 +00:00
srowen 394fb04c81 Reformatting and minor code tweaks
git-svn-id: https://zxing.googlecode.com/svn/trunk@621 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-17 14:48:22 +00:00
dswitkin 0d7dfdbfae Added the missing AndroidHttpClient to the package, which fixes the Android client build using the 1.0 SDK.
git-svn-id: https://zxing.googlecode.com/svn/trunk@613 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-13 16:08:58 +00:00
dswitkin 39bc2d9bdd Fixed missing "Send SMS" button in Android client. We showed the SMS number but were unable to launch the SMS app without this.
git-svn-id: https://zxing.googlecode.com/svn/trunk@579 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-09-11 15:37:17 +00:00
dswitkin db58d130a8 Small updates and improvements to the Android client.
git-svn-id: https://zxing.googlecode.com/svn/trunk@577 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-09-11 14:02:28 +00:00
dswitkin fecaba26de The new 0.9 SDK Android client (for real this time).
git-svn-id: https://zxing.googlecode.com/svn/trunk@569 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-08-19 19:14:09 +00:00
dswitkin b8eef13b00 Deleted the M5 Android client in preparation for an up-to-date version for the 0.9 SDK.
git-svn-id: https://zxing.googlecode.com/svn/trunk@567 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-08-19 16:26:01 +00:00
srowen 6d124e1be5 Minor style tweaks
git-svn-id: https://zxing.googlecode.com/svn/trunk@503 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-07-09 17:24:02 +00:00
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