Commit graph

183 commits

Author SHA1 Message Date
srowen@gmail.com 939ff355df [maven-release-plugin] rollback the release of zxing-2.2
git-svn-id: https://zxing.googlecode.com/svn/trunk@2727 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-05-14 06:45:31 +00:00
srowen@gmail.com 40416935ca [maven-release-plugin] prepare release zxing-2.2
git-svn-id: https://zxing.googlecode.com/svn/trunk@2724 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-05-14 06:34:02 +00:00
srowen@gmail.com ad1a305cf6 Add uri blocklist feature
git-svn-id: https://zxing.googlecode.com/svn/trunk@2711 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-05-05 12:41:41 +00:00
srowen@gmail.com 25f00bfdaf Update trivial root level redirector page
git-svn-id: https://zxing.googlecode.com/svn/trunk@2689 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-04-25 15:26:31 +00:00
srowen@gmail.com 7c6ac647e3 More build refinement, HTTP improvements, small info retrieval refactoring
git-svn-id: https://zxing.googlecode.com/svn/trunk@2687 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-04-24 18:19:36 +00:00
srowen@gmail.com 57dc2ca742 Fix and improve last commit for data URIs
git-svn-id: https://zxing.googlecode.com/svn/trunk@2683 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-04-23 09:08:26 +00:00
srowen@gmail.com 13d97af689 Try to support data: URIs
git-svn-id: https://zxing.googlecode.com/svn/trunk@2682 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-04-23 08:11:46 +00:00
srowen@gmail.com f4ae6f0631 Issue 1670 remove Ant scripts in favor of Maven where possible
git-svn-id: https://zxing.googlecode.com/svn/trunk@2666 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-04-21 11:30:54 +00:00
srowen@gmail.com cdd033e582 Fix <br/> escaping that doesn't work
git-svn-id: https://zxing.googlecode.com/svn/trunk@2658 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-04-17 19:45:05 +00:00
srowen@gmail.com c835ed3be6 Fix incorrect byte display in some cases, refactor and simplify and even speed up output a little
git-svn-id: https://zxing.googlecode.com/svn/trunk@2648 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-04-10 21:57:30 +00:00
srowen@gmail.com ac23123ebf Add javac encoding=UTF-8 elsewhere
git-svn-id: https://zxing.googlecode.com/svn/trunk@2616 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-04-01 09:20:03 +00:00
srowen@gmail.com e5591c71fd Update to newer fileupload, lang libs
git-svn-id: https://zxing.googlecode.com/svn/trunk@2598 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-03-27 19:20:50 +00:00
srowen@gmail.com fe9e0ccf6a Raise MP limit and improve message about limit on decode page
git-svn-id: https://zxing.googlecode.com/svn/trunk@2597 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-03-27 09:54:44 +00:00
srowen@gmail.com b01cff36fa Various changes from IJ12.1 inspections
git-svn-id: https://zxing.googlecode.com/svn/trunk@2581 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-03-01 20:01:40 +00:00
srowen 99e0f8d61b Minor touch ups of HTML, show full output for uploads, add more explanatory text and links, update to servlet 3 / JSP 2.2
git-svn-id: https://zxing.googlecode.com/svn/trunk@2540 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-11-28 22:12:37 +00:00
srowen 6698e919e9 More changes for Elastic Beanstalk -- logging, no need for DoS
git-svn-id: https://zxing.googlecode.com/svn/trunk@2537 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-11-27 23:57:07 +00:00
srowen ceca8b4ff7 Update zxing.org web app for Amazon Elastic Beanstalk
git-svn-id: https://zxing.googlecode.com/svn/trunk@2536 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-11-27 23:34:04 +00:00
srowen 57e42a99fc Update to Commons IO 2.4
git-svn-id: https://zxing.googlecode.com/svn/trunk@2426 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-09-27 11:43:16 +00:00
srowen b58a3e3c1d Add server.xml too for safekeeping
git-svn-id: https://zxing.googlecode.com/svn/trunk@2348 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-07-09 13:46:21 +00:00
srowen d1b3ca2e24 Add restart script for safekeeping
git-svn-id: https://zxing.googlecode.com/svn/trunk@2347 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-07-09 11:50:09 +00:00
srowen 500872c9ff Avoid a few more rare exceptions
git-svn-id: https://zxing.googlecode.com/svn/trunk@2284 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-05-10 09:00:48 +00:00
srowen 41c4e34063 Fix problem blocking access to javadoc
git-svn-id: https://zxing.googlecode.com/svn/trunk@2249 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-04-06 07:33:00 +00:00
srowen 73345ae493 Another try at CLOSE_WAIT: simplify by removing HttpClient, always consume every byte of input in all cases, and force GCs to clear stuck sockets
git-svn-id: https://zxing.googlecode.com/svn/trunk@2240 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-03-30 10:50:47 +00:00
srowen 65efebdc97 More drastic changes to prevent CLOSE_WAIT - defensive socket settings, ban a troublesome IP
git-svn-id: https://zxing.googlecode.com/svn/trunk@2238 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-03-29 18:18:19 +00:00
srowen bd1d0c4bef Update zxing.org libs, update NOTICE, try again to fix CLOSE_WAIT issue with simpler HTTP client handling
git-svn-id: https://zxing.googlecode.com/svn/trunk@2237 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-03-29 14:32:35 +00:00
srowen b8b80aebf6 Issue 1189 remove old links and redirect to decoder
git-svn-id: https://zxing.googlecode.com/svn/trunk@2208 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-03-02 12:48:47 +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
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 8ff9e7f4fa Standardized the naming of our barcode formats and alphabetized them.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1775 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-05-17 15:46:09 +00:00
srowen c4dede3689 Style changes to Aztec, enable in web app and command line
git-svn-id: https://zxing.googlecode.com/svn/trunk@1669 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-11-21 20:47:00 +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 c194eb915c Preserve line breaks into XHTML
git-svn-id: https://zxing.googlecode.com/svn/trunk@1534 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-16 11:09:49 +00:00
dswitkin@google.com 2cb4f5f82b Issue 495: Renamed DATAMATRIX to DATA_MATRIX for consistency.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1508 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-05 15:22:30 +00:00
srowen 73bb0192a3 On the way to deploy new verison, add favicon
git-svn-id: https://zxing.googlecode.com/svn/trunk@1463 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-29 16:18:34 +00:00
srowen 492492b591 Update Codabar style and disable it as its causing too many false positives
git-svn-id: https://zxing.googlecode.com/svn/trunk@1403 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-31 12:49:29 +00:00
srowen 05e8181ef5 Add Code 93 support. Update tests to reflect new (better) number of successes.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1398 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-30 14:37:08 +00:00
srowen 0e0bed8b50 Tiny NPE fix
git-svn-id: https://zxing.googlecode.com/svn/trunk@1352 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-11 11:44:18 +00:00
srowen 5e026d8535 Fix a typo or two from the last commit
git-svn-id: https://zxing.googlecode.com/svn/trunk@1345 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-08 21:10:54 +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 612581ce71 Watch for CMMException
git-svn-id: https://zxing.googlecode.com/svn/trunk@1307 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-15 21:38:15 +00:00
srowen 7fb0fea91f Support reading multiple barcodes in one image.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1255 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-25 17:22:45 +00:00
srowen aa8ad02e16 Add pure barcode support to web app and command line
git-svn-id: https://zxing.googlecode.com/svn/trunk@1228 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-01 12:09:43 +00:00
srowen 5ef5f3b02d "Split" ReaderException into subclasses to enable more useful error reporting
git-svn-id: https://zxing.googlecode.com/svn/trunk@1195 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-02 08:23:46 +00:00
srowen 87f2fada9a Pre-RSS-14 changes. Necessary code changes, but not the decoder. Committing this since it does no harm and clears out my client so I can modify these files for other purposes.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1193 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-01 19:41:17 +00:00
srowen 7cd9541e90 Try both binarizers, use appspot stylesheet, update dependency libs
git-svn-id: https://zxing.googlecode.com/svn/trunk@1192 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-31 14:43:44 +00:00
srowen 6b4a10a302 Issue 312, use old global binarizer for uploaded images
git-svn-id: https://zxing.googlecode.com/svn/trunk@1176 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-05 15:33:53 +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
srowen 7d0acf8bd9 Tiny changes to System.err usage, closed a stream, saved a reused Pattern
git-svn-id: https://zxing.googlecode.com/svn/trunk@1064 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-26 13:25:37 +00:00
srowen 938c44c17a Another shot at TCP CLOSE_WAIT issue, and tiny code tweak
git-svn-id: https://zxing.googlecode.com/svn/trunk@1057 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-18 10:27:17 +00:00
srowen 5dd4b663ce Further attacks on the mysterious TCP CLOSE_WAIT issue
git-svn-id: https://zxing.googlecode.com/svn/trunk@1056 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-16 10:39:53 +00:00
srowen 9045bd2409 Update to final HTTP Client binaries
git-svn-id: https://zxing.googlecode.com/svn/trunk@1037 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-08-21 16:17:50 +00:00
srowen 3cab89a732 Make web app work on Servlet/JSP 2.3/1.2 and fix some other mistakes
git-svn-id: https://zxing.googlecode.com/svn/trunk@1034 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-08-13 11:11:48 +00:00
srowen b6b9015a7c Disable email-based decoding -- won't be able to support it soon and it is very rarely used by anyone. Leaving code in for future reference though.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1030 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-08-04 08:54:02 +00:00
srowen a4b2678420 Updates for appspot
git-svn-id: https://zxing.googlecode.com/svn/trunk@995 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-26 18:08:05 +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
srowen 657a4473fd Small tweaks, use more friendly content type
git-svn-id: https://zxing.googlecode.com/svn/trunk@959 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-28 12:05:01 +00:00
srowen cfff716c6c Oops new HTTP lib has a slightly difference exception signature in one method
git-svn-id: https://zxing.googlecode.com/svn/trunk@917 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-26 13:51:58 +00:00
srowen 8081bba41f Update to more recent HttpClient
git-svn-id: https://zxing.googlecode.com/svn/trunk@915 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-19 15:58:27 +00:00
srowen c6fee110c6 Try to resolve CLOSE_WAIT issue on zxing.org
git-svn-id: https://zxing.googlecode.com/svn/trunk@909 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-15 10:51:14 +00:00
srowen dea0247615 Enable DataMatrix in the web app / other small tweaks
git-svn-id: https://zxing.googlecode.com/svn/trunk@903 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-10 13:46:11 +00:00
srowen 62d9959a3c Remove my old email address from files. Might as well save spammers the trouble.
git-svn-id: https://zxing.googlecode.com/svn/trunk@706 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-15 00:07:25 +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
srowen 8583883e5a git-svn-id: https://zxing.googlecode.com/svn/trunk@580 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2008-09-12 15:04:37 +00:00
srowen 67d139dadb git-svn-id: https://zxing.googlecode.com/svn/trunk@574 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2008-09-01 00:33:53 +00:00
srowen 970382f1e0 Better separated out email decoding functionality
git-svn-id: https://zxing.googlecode.com/svn/trunk@558 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-08-12 20:09:21 +00:00
srowen 91b0ef1622 Some small improvements in error handling based on exceptions observed at zxing.org
git-svn-id: https://zxing.googlecode.com/svn/trunk@538 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-07-30 21:58:17 +00:00
srowen d0af16c36c Update to latest HTTP Core/Client libs
git-svn-id: https://zxing.googlecode.com/svn/trunk@518 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-07-15 23:41:24 +00:00
srowen f02c4f0cfc one last typo fix
git-svn-id: https://zxing.googlecode.com/svn/trunk@515 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-07-10 22:11:12 +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 295319a685 Oops, make sure to XML-escape results
git-svn-id: https://zxing.googlecode.com/svn/trunk@492 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-27 19:31:40 +00:00
srowen 47e67ae145 Better bytes-to-String method for verbose output
git-svn-id: https://zxing.googlecode.com/svn/trunk@491 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-27 19:19:18 +00:00
srowen 0e311f40c9 Standardize getDisplayResult() implementation in parsed results, and fix up web site download page to show one J2ME download
git-svn-id: https://zxing.googlecode.com/svn/trunk@490 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-27 18:55:00 +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 a5060f9338 Minor change to standardize on more canonical "UTF8" name for encoding in Java
git-svn-id: https://zxing.googlecode.com/svn/trunk@483 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-26 20:02:30 +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
srowen 6921d91095 Added raw bytes to human readable output of zxing.org decoder
git-svn-id: https://zxing.googlecode.com/svn/trunk@438 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-18 17:56:29 +00:00
srowen 83e8ca4eca Make sure to clean up generated web.xml with password!
git-svn-id: https://zxing.googlecode.com/svn/trunk@434 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-16 17:32:16 +00:00
srowen 8319cf2097 git-svn-id: https://zxing.googlecode.com/svn/trunk@404 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2008-05-27 17:58:59 +00:00
srowen 5c705313bb Improvements and refinements to web site
git-svn-id: https://zxing.googlecode.com/svn/trunk@397 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-11 18:01:23 +00:00
srowen bad9cc10af Oops, one more compile problem fixed. Also delete redundant copies of core and javase jars.
git-svn-id: https://zxing.googlecode.com/svn/trunk@387 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-05 17:54:15 +00:00
srowen 13b637fa53 Reformatted code, updated to new Analytics tags, fixed a problem with EmailAuthenticator
git-svn-id: https://zxing.googlecode.com/svn/trunk@386 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-05 17:39:33 +00:00
srowen 3d4d5b3498 Added source code to zxing.org
git-svn-id: https://zxing.googlecode.com/svn/trunk@383 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-02 22:18:38 +00:00