Commit graph

100 commits

Author SHA1 Message Date
smparkes@smparkes.net 2c787d8440 Port r1623 changes to C++
This provide C++ support for Hanzi from issue 582. With it the C++
qrcode blackbox test results again match the Java results.

The changes are mostly a re-port of various pieces of the Java code
for supporting modes and bit stream parsing in QR codes. It expands
the modes/parsing including ECI and FNC, refactors StringUtils as was
done in Java, and makes DecoderResult include the fields that the Java
code has.

Although the non-qrcode blackbox tests don't all match the Java code
(a known issue) the entire blackbox suite was run under valgrind and
has no errors, including invalid memory references and leaks.

This commit also includes a few cleanups for things like files that
had mixed line endings, i.e., a combination of LF and CR-LF.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1966 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-13 15:21:13 +00:00
smparkes@smparkes.net 492d773f59 formatting cleanup before trying to make the last failing C++ qr blackbox test pass
git-svn-id: https://zxing.googlecode.com/svn/trunk@1965 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-13 15:20:47 +00:00
smparkes@smparkes.net beeef242b2 formatting cleanup before trying to make the last failing C++ qr blackbox test pass
git-svn-id: https://zxing.googlecode.com/svn/trunk@1964 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-13 15:20:25 +00:00
smparkes@smparkes.net 9558d83d71 port relevant parts of r1937 to C++
git-svn-id: https://zxing.googlecode.com/svn/trunk@1962 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-12 18:11:40 +00:00
smparkes@smparkes.net ccf08aabe8 port r1921 java changes to C++
git-svn-id: https://zxing.googlecode.com/svn/trunk@1961 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-12 17:41:05 +00:00
smparkes@smparkes.net c7e2f62050 port r1899 java changes to C++
git-svn-id: https://zxing.googlecode.com/svn/trunk@1960 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-12 17:02:48 +00:00
smparkes@smparkes.net b72031d6e8 port r1875 to C++
git-svn-id: https://zxing.googlecode.com/svn/trunk@1959 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-12 16:41:57 +00:00
smparkes@smparkes.net e1457f76a7 remove some dead code
git-svn-id: https://zxing.googlecode.com/svn/trunk@1956 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-11 19:39:56 +00:00
smparkes@smparkes.net f395cd4a48 tweak target sdk and force llvm-gcc
git-svn-id: https://zxing.googlecode.com/svn/trunk@1952 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-09 18:55:33 +00:00
smparkes@smparkes.net b5c1f5e96d add armv6
git-svn-id: https://zxing.googlecode.com/svn/trunk@1923 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-09-20 18:04:22 +00:00
smparkes@smparkes.net 8491949707 remove llvm overrides
git-svn-id: https://zxing.googlecode.com/svn/trunk@1922 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-09-20 18:04:15 +00:00
smparkes@smparkes.net 7829686a8a avoid a -Wall warning (and remind myself how to override CXX)
git-svn-id: https://zxing.googlecode.com/svn/trunk@1902 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-09-02 21:40:29 +00:00
smparkes@smparkes.net 824ab62a40 xcode updates
git-svn-id: https://zxing.googlecode.com/svn/trunk@1890 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-08-20 20:02:37 +00:00
srowen 7daf9dc760 Issue 920 add ITF length 18, make C++ consistent with Java here
git-svn-id: https://zxing.googlecode.com/svn/trunk@1862 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-07-23 14:09:14 +00:00
srowen de125e2ddc Issue 911 update Code 128 from Java to fix some issues
git-svn-id: https://zxing.googlecode.com/svn/trunk@1858 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-07-14 18:32:23 +00:00
smparkes@smparkes.net 776e9b6a06 C++ changes to parallel r1837
git-svn-id: https://zxing.googlecode.com/svn/trunk@1840 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-06-28 16:06:13 +00:00
smparkes@smparkes.net 395cdb0f24 formatting only
git-svn-id: https://zxing.googlecode.com/svn/trunk@1839 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-06-28 16:02:20 +00:00
smparkes@smparkes.net 0d4ae9fef6 Port Java qr detector changes
re-port
Detector::sizeOfBlackWhiteBlackRunBothWays
and
Detector::sizeOfBlackWhiteBlackRun
to reflect changes from r1820 and earlier.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1838 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-06-28 15:59:45 +00:00
smparkes@smparkes.net f17a43df81 use correct vector size after possible erases
git-svn-id: https://zxing.googlecode.com/svn/trunk@1817 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-06-09 20:00:14 +00:00
smparkes@smparkes.net 47b28a4edb objective c port for iOS and OS X
git-svn-id: https://zxing.googlecode.com/svn/trunk@1773 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-05-17 02:07:56 +00:00
smparkes@smparkes.net d65d3e0d4b Issue 820 second format info was read incorrectly
Semantically, this is just C++ version of the changes from Java. I also did
some minor renaming of variables to match the current Java source to aide
in keeping the two trees in sync.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1754 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-04-29 18:01:46 +00:00
rpechayr 7b4f5b86ef [cpp] Removed a const qualifier that was generating a warning with clang
git-svn-id: https://zxing.googlecode.com/svn/trunk@1730 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-03-29 11:40:25 +00:00
srowen 7a6cc4c3d0 Various user-contributed fixes (Issue 701, Issue 710, Issue 714, Issue 718)
git-svn-id: https://zxing.googlecode.com/svn/trunk@1717 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-02-15 13:23:14 +00:00
rpechayr 3e00ecd283 [cpp] Minor Changes. Changed static members initialization into enum to make the code build with clang, and probably visual c++, removed some dead code detected by clang static analyzer
git-svn-id: https://zxing.googlecode.com/svn/trunk@1689 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-12-22 17:31:16 +00:00
smparkes@smparkes.net d98d2af1ab Issue 524
git-svn-id: https://zxing.googlecode.com/svn/trunk@1570 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-31 03:18:56 +00:00
flyashi 84b6b3d57b C++: fix dormat BitArray quiet zone checking bug that was causing rampant false positives
also make zxing test app decode call a little cleaner.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1566 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-26 14:46:31 +00:00
dswitkin@google.com d26cfc7fd1 Added rounding code to the C++ port as well.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1565 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-26 14:13:33 +00:00
dswitkin@google.com 0f431db54d Removed dynamic allocation of new int[2] when searching for
guard patterns to improve performance.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1563 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-25 20:51:14 +00:00
dswitkin@google.com 886b70e167 Minor formatting cleanup.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1562 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-25 19:03:32 +00:00
dswitkin@google.com aca11201ed Converted tabs to spaces.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1561 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-25 18:39:14 +00:00
dswitkin@google.com 3d9063dd17 Removed an extra memcpy and made getMatrix() pure virtual.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1556 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-24 18:59:26 +00:00
flyashi ca1cf153d6 GreyscaleRotatedLuminanceSource: implemented getMatrix()
BitMatrix: implemented getRow


git-svn-id: https://zxing.googlecode.com/svn/trunk@1551 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-20 20:24:20 +00:00
smparkes@smparkes.net 124ef03ca9 Allow a few build-time arguments to the C++ build
Add DEBUG and PIC flags to scons so you can now build without debug, e.g.,
  scons DEBUG=false lib
or with -fPIC forced, e.g,.
  scons PIC=true lib

Defaults haven't changed.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1550 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-20 18:46:05 +00:00
smparkes@smparkes.net dd1336d0cf Tweak svn/git ignores
Add OS X libzxing.a project
Include a copy of scons-local for cpp


git-svn-id: https://zxing.googlecode.com/svn/trunk@1549 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-20 00:41:26 +00:00
dswitkin@google.com f9bc448926 Fixed a bug I introduced while removing exceptions, which caused the
x coordinate of 1D barcodes to always be flipped, as if they had been
read upside down.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1547 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-18 18:31:49 +00:00
smparkes@smparkes.net 3f8639c67e Issue 520
git-svn-id: https://zxing.googlecode.com/svn/trunk@1545 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-17 20:12:10 +00:00
smparkes@smparkes.net a251967f55 Issue 519
git-svn-id: https://zxing.googlecode.com/svn/trunk@1543 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-17 16:19:57 +00:00
dswitkin@google.com 56e9cef5b3 Fixed the double delete problem remaining in issue 503.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1536 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-16 15:34:00 +00:00
dswitkin@google.com e68b2951f4 Removed as many exceptions as possible from the C++ product readers
to improve performance. There is no change in the number of images
which pass the unit tests.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1535 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-16 15:17:39 +00:00
dswitkin@google.com 2476762007 Changed OneDReader::recordPattern to not throw exceptions. For now it just
moves them up a level to the callers.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1531 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-13 19:47:13 +00:00
dswitkin@google.com 56ad5f5554 Began removing the excessive use of exceptions in the 1D readers by drawing
a line in the sand: no one may throw an exception from decodeRow(). Next up
is to throw fewer exceptions internally.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1527 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-13 16:20:03 +00:00
srowen b868c6e3ae Issue 509
git-svn-id: https://zxing.googlecode.com/svn/trunk@1525 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-12 20:54:54 +00:00
srowen 00322f3873 Issue 505
git-svn-id: https://zxing.googlecode.com/svn/trunk@1524 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-12 20:51:09 +00:00
srowen 0a6cac9820 Issue 508
git-svn-id: https://zxing.googlecode.com/svn/trunk@1523 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-12 20:24:38 +00:00
srowen 6c9812e9bb Issue 511
git-svn-id: https://zxing.googlecode.com/svn/trunk@1522 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-12 20:18:08 +00:00
dswitkin@google.com b7f70012ca Fixed issue 503, adding support for getMatrix() in GreyscaleLuminanceSource. Also clarified
that getRow() and getMatrix() require the caller to delete the allocated memory.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1521 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-11 22:10:29 +00:00
dswitkin@google.com be31406b94 Removed an extra BitArray, honored the result of LuminanceSource.getRow(), and fixed
a bunch of formatting.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1520 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-11 15:17:35 +00:00
srowen 438746649d Issue 497
git-svn-id: https://zxing.googlecode.com/svn/trunk@1515 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-07 13:22:47 +00:00
dswitkin ffb33d4c74 Slight refinement to last change - a cached row which
failed should throw an exception, not return NULL.


git-svn-id: https://zxing.googlecode.com/svn/trunk@1513 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-07 12:50:16 +00:00
dswitkin a2226af690 Fixed a bug which prevented this binarizer from caching rows.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1512 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-06 23:33:48 +00:00