mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 13:37:34 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
557 commits 5 branches 32 tags 330 MiB
Commit graph

557 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
dswitkin bbbef0d716 Wrote a new bookmark picker activity for use by the Share button, because I couldn't get the platform version to work. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@691 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-12 15:42:44 +00:00
dswitkin acd409b094 Fixed a regression in the QR Code encoder. The contents do not need to be run through URLEncoder first. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@690 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-12 14:40:23 +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 bb52a165d0 Changed the ChartServer and Search Book Contents URLs back to google.com instead of using the LocaleManager, as they are API calls, not user-facing websites. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@687 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-11 19:19:11 +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 88b77d67db Now attempts to use locale-specific Google property in client. Also made some stuff final that can be. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@685 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-11 15:32:31 +00:00
dswitkin 5a26635782 Somehow the IntelliJ Subversion integration did not commit these deleted files when I did the rename. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@684 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-11 14:48:11 +00:00
dswitkin 9de8f5e1f0 Hid the Share menu if the results screen was showing, since it didn't make sense. Also change the autofocus delay to 1.5 seconds, to make it hunt a little less, and give the autoexposure system more time to run. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@683 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-10 22:47:09 +00:00
dswitkin aef1dedb61 Did a bunch of renaming, there was no need for the Barcodes prefix. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@682 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-10 20:50:34 +00:00
dswitkin f21c34ae16 First pass at adding a UI for sharing data via QR Codes. There's now a Share button in the main capture menu which leads to a choice of contacts, bookmarks, and clipboard contents, which will be encoded and shown full screen. Launching the bookmarks picker currently crashes with a permission problem, which I'm investigating. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@681 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-10 20:35:33 +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
dswitkin 99f49760da Renamed launcher icon. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@676 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-07 15:07:54 +00:00
dswitkin de83fdf806 Fixed two leaks when using AndroidHttpClient. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@675 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-06 19:55:38 +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 034b6ef1f2 Added support for landscape mode when encoding QR Codes, and made some small layout improvements. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@672 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-06 17:17:07 +00:00
dswitkin d9dce6b108 Finished renaming UPC --> Product in a few places. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@671 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-06 16:25:39 +00:00
dswitkin 4c5c81e8a5 Added support for supplying a postal address when encoding a QR Code. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@670 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-06 16:13:16 +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 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 1ecf5c98fd Fixed the ZXing Test camera mode when using ProGuard. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@666 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-02 16:10:54 +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
dswitkin b3b945efcc Whoops, the benchmarks are in microseconds, not milliseconds. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@660 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-11-01 00:40:07 +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 952dc0ea77 Added a --dump_results flag to the J2SE client, which will create a text file of the contents of each file scanned. This is very useful for adding golden results for new blackbox images tests. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@657 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-10-31 17:57:31 +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 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 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 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 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 db3c669847 Add back basic link 
git-svn-id: https://zxing.googlecode.com/svn/trunk@646 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2008-10-28 10:30:32 +00:00