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

60 commits

Author SHA1 Message Date
srowen 8f461afd09 Let callers specify more extras to IntentIntegrator. Use it in test app, so we can use it in all cases, and avoid ActivityNotFoundException 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2260 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-04-26 16:22:24 +00:00
srowen 9f07c47941 Apparently some of the default disabled optimizations are only there for Donut 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2245 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-03-31 23:13:16 +00:00
srowen a670311585 Updated proguard.cfg to match new default for SDK 17 / Proguard 4.7 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2231 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-03-22 11:26:14 +00:00
dswitkin@google.com a157931333 Cleaned up the ZXing Test manifest to match the Barcode Scanner one. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2139 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-02-03 22:24:17 +00:00
srowen f2fe9dbd67 Added more metadata to the integrator 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2068 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-12-06 20:13:27 +00:00
srowen ac499ddaf6 Issue 876 add ability to customize prompt (and reshuffle a few items in CaptureActivity for clarity) 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2066 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-12-06 11:44:17 +00:00
dswitkin@google.com 77a9722e16 - Bumped the versionCode to one past 3.72. 
- Fixed the ij-install target which the new Android SDK broke.

git-svn-id: https://zxing.googlecode.com/svn/trunk@2043 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-17 19:19:55 +00:00
srowen 8198d32f53 Let Proguard work for release builds 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2039 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-16 23:51:06 +00:00
srowen f328cb618e Update ZXingTest to work on 3.x+, mostly by removing the camera capture bit for now. It can come back after android/ is updated and can be cloned again. Updated android-integration with better API and ability to specify package. Now ZXingTest uses our integration code. It's updated for Android 2.x and reports camera params in a slightly better form. Also fixed a few Android 2.x issues and related intent integration stuff left over from other recent changes. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2020 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-10 11:16:24 +00:00
dswitkin@google.com c79fb8474b Added build targets for IntelliJ which can't see the built-in Android targets. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2009 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-02 19:58:54 +00:00
srowen 79add84a5a Recreate build files for android, androidtest, for latest SDK 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2008 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-02 19:34:19 +00:00
srowen db60385d7d Update all Java code to use Java 6 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2002 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-02 11:16:30 +00:00
dswitkin a4b22a4183 Fixed typo in effort to build new ZXingTest binary. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2000 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-01 20:45:08 +00:00
dswitkin@google.com deea2105b7 Added an option to hide the contents when encoding a barcode via Intent. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1988 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-10-21 21:09:13 +00:00
srowen 177e8728c9 Add a couple helpful methods 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1899 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-09-01 08:51:04 +00:00
dswitkin@google.com a3ec3038dd - Fixed Issue 892: Barcode Scanner crashes when started via Intent with scanning rectangle dimensions. 
- Updated What's New page.
- Bumped Android SDK version.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1847 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-07-06 15:43:55 +00:00
srowen df65c5b83e A bunch of code style related changes 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1795 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-05-21 03:36:39 +00:00
dswitkin@google.com 11d348a59f Cleaned up a bunch of TODOs and deleted the old ImageConverter app which has been supplanted by CommandLineRunner. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1778 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-05-17 20:13:20 +00:00
dswitkin@google.com e3e0a12da8 Issue 835: Added support for specifying a width and height for the scanning rectangle when launching Barcode Scanner by Intent. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1776 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-05-17 19:20:38 +00:00
dswitkin@google.com 78b9ac5cad Fixed the ZXingTest Ant file to work with the latest SDK. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1720 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-02-23 23:05:55 +00:00
srowen 99d09e0a44 Style stuff mostly but fix a problem between Aztec and J2ME too 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1681 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-12-15 14:42:17 +00:00
srowen 5108924d05 Use includeantruntime=false to avoid Ant 1.8 warning 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1631 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-10-25 21:03:11 +00:00
srowen 4f7bc9d8ab Don't use Build.VERSION_CODES as it's not in 1.5 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1595 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-09-18 10:45:38 +00:00
dswitkin@google.com aa94b2a633 Updated the ZXingText Ant file to match the Barcode Scanner one. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1553 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-08-23 15:39:33 +00:00
srowen 87b0b9c8aa Tighten up some stuff I saw from the logs 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1344 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-05-08 20:56:31 +00:00
srowen 3a415a4994 Fix small compile error in javame/, update for Java ME SDK 3.x layout, finally disentangle Proguard location from WTK 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1302 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2010-04-12 08:59:41 +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 01792f7460 Made the Android test app build with ProGuard again. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1153 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-12-13 15:23:12 +00:00
dswitkin ac2ea432c0 Updated ZXing Test with all of the CameraManager fixes from Barcode Scanner, as well as making it high-dpi capable, and bumped the version to 1.12. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1102 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-11-06 15:55:00 +00:00
dswitkin d2fea027ec The Donut (1.6) SDK is required to build all Android apps in the project. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1099 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-11-05 22:08:13 +00:00
dswitkin fbae6e32e9 Changed the ZXing Test default email address and bumped the version to 1.11. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1097 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-11-03 23:12:14 +00:00
dswitkin 77a263dd91 Extended the test app to write the camera parameters to /sdcard/CameraParameters.txt in addition to emailing them. Also bumped the version to 1.1. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1063 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-09-25 21:38:26 +00:00
dswitkin 5e752acd25 Added a new feature to the test app, which captures all the device info and default camera parameters, then bundles them up into an email. This will make it very easy to get some important info about new devices from users (e.g. the HTC Hero which I don't have). 
Also did a lot of other cleanup, added an about box, and prepared the app to be released on the Market.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1045 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-09-02 21:06:00 +00:00
dswitkin 9dc583f556 Set a camera parameter to force the flash off. Also fixed the uninstall build targets. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1024 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-07-21 21:36:33 +00:00
dswitkin d71c099313 Converted the Android client and the test app to use the Android 1.5 SDK, and to use a more efficient preview frame mechanism too. We now require devices to be running Cupcake or a newer version of the platform. This change temporarily removes the Proguard step, which Sean is going to add back. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1023 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-07-21 19:33:25 +00:00
dswitkin cca4b72bfa Whoops, fixed long-standing bug in the benchmark. Never noticed before because we always used square images. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1001 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-06-26 21:18:58 +00:00
dswitkin 8acb0017b1 Updated the Android Test app to use a wider viewfinder, to save images as PNGs instead of JPEGs, and to work on phones without a shutter button. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@996 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-06-26 18:48:14 +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
dswitkin 5edd5dab77 Calculated total time taken by the benchmark, and also reported it in the UI (in addition to logcat). 
git-svn-id: https://zxing.googlecode.com/svn/trunk@966 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-06-08 19:17:34 +00:00
dswitkin 0827af1d89 Made the Android Test app debuggable so I can examine memory allocation patterns using DDMS (part of the Android SDK). 
git-svn-id: https://zxing.googlecode.com/svn/trunk@957 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-05-27 18:10:47 +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
srowen f908920992 Tweak to compile with Android 1.5 but still work in 1.1 
git-svn-id: https://zxing.googlecode.com/svn/trunk@908 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-04-15 09:58:54 +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
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 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 1c539c66a4 Convert asserts to exceptions where the conditions could be false in a correct, bug-free program -- makes sure caller errors are caught and reported meaningfully 
git-svn-id: https://zxing.googlecode.com/svn/trunk@840 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2009-02-05 13:06:19 +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
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 405aba0044 Latent bug I think from earlier change to List from Vector 
git-svn-id: https://zxing.googlecode.com/svn/trunk@713 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-17 17:53:05 +00:00
srowen ad307ebc0b making stuff final, weakening types, etc. per IntelliJ analysis 
git-svn-id: https://zxing.googlecode.com/svn/trunk@693 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-13 13:14:53 +00:00