Commit Graph

566 Commits

Author SHA1 Message Date
Robin Stuart
542ec7c7a5 When libpng is not found, default to GIF output 2016-08-26 11:44:02 +01:00
Robin Stuart
085ec8477c Add framework for Codablock 2016-08-24 19:39:39 +01:00
Robin Stuart
4e13b0e95d Add framework for Codablock 2016-08-24 19:37:49 +01:00
Harald Oehlmann
b527245a5f Merge branch 'master' of ssh://git.code.sf.net/p/zint/code 2016-08-22 19:08:39 +02:00
Harald Oehlmann
50a48c1294 Silence signed compiler warnings 2016-08-22 19:08:00 +02:00
Robin Stuart
94733dd5f5 Bugfix: increase ECC if there is capacity
Bug found by Michael
2016-08-22 18:07:27 +01:00
Harald Oehlmann
3893f6f158 Make compile with MSVC6++ 2016-08-22 18:58:32 +02:00
Robin Stuart
eedb4c638a Expand symbol memory to allow biggest Han Xin without crashing 2016-08-21 21:58:38 +01:00
Robin Stuart
2e11b5f8d3 Bugfix: Crash on setting option_2 for DotCode
Bug report by Michael
2016-08-19 18:22:16 +01:00
Robin Stuart
3b366bbbd2 Stop crashing with large DotCode symbols 2016-08-17 17:22:31 +01:00
Robin Stuart
9d1c20201d Add ECI encoding 2016-08-16 12:43:41 +01:00
Robin Stuart
bcad6504b5 Restrict dotty mode to matrix symbols 2016-08-12 19:30:46 +01:00
Robin Stuart
498fd4151d Add dot (circle) plotting for raster (PNG/GIF/PCX/BMP) images 2016-08-08 23:18:55 +01:00
Robin Stuart
30b8bebf82 Remove compiler warnings 2016-08-07 21:00:27 +01:00
Robin Stuart
d7fd2dc584 Remove autogenerated makefiles 2016-08-07 20:39:26 +01:00
Robin Stuart
8029dec9c7 Merge Dotcode 2016-08-07 20:28:56 +01:00
Robin Stuart
674a491a56 Dotcode: Add custom height setting and format code 2016-08-07 20:11:51 +01:00
Robin Stuart
0c5f9191e6 DotCode: Place data in symbol and evaluate bitmask 2016-08-06 22:03:36 +01:00
Harald Oehlmann
08c88e85d2 Added gif output 2016-07-28 20:58:33 +02:00
Harald Oehlmann
3939a1ae54 Make compile with MSVC6 (no C99 compatibility) 2016-07-28 10:32:46 +02:00
Robin Stuart
70fb17fcb4 DotCode: Calculate masks and Reed-Solomon error bytes 2016-07-27 12:18:53 +01:00
Robin Stuart
340bcd2833 DotCode: New symbology added and encoding to codewords as set out in Annex F
Does not produce DotCode symbols yet
2016-07-25 22:52:29 +01:00
Robin Stuart
804ca24aca Correct bizarre use of isX12()
Bug spotted by Milton Neal
2016-07-25 22:46:26 +01:00
Robin Stuart
118caf10ea Silence debug output 2016-07-23 19:22:12 +01:00
Robin Stuart
b968073d71 --typo 2016-07-23 19:17:53 +01:00
Robin Stuart
7eaa82bfa1 Improved PCX algorithm, uses less memory 2016-07-23 19:14:57 +01:00
Robin Stuart
babeaec41d Add ZSoft PCX image file output 2016-07-23 15:08:55 +01:00
Robin Stuart
7e3a56815f Correct header info 2016-07-22 17:21:40 +01:00
Robin Stuart
c35378acc5 Bugfix: EDIFACT unlatch character not needed for all symbols
Ref: ISO 16022 para 5.2.8.2
Bug reported by Daniel Yang
2016-07-22 16:42:39 +01:00
Robin Stuart
8f7cc8d8b1 Remove error in file descriptor 2016-07-19 23:09:08 +01:00
Robin Stuart
08e51cf5bb Separate PNG and BMP file handling routines and create common framework to allow addition of more output file formats 2016-07-19 23:02:39 +01:00
Robin Stuart
6dcc6af817 Make bitmap size available to API 2016-07-18 20:22:56 +01:00
Robin Stuart
75384ca009 Add bitmap (BMP) file support
And upgrade symbol->bitmap structure to reflect BMP format
Based on work by Adrian Keller
2016-07-18 20:14:56 +01:00
Robin Stuart
e39d2ff915 Add dot mode (experimental)
First step towards solution for ticket #29
2016-07-12 15:00:25 +01:00
Harald Oehlmann
188cfcdd1f Compile MS-VC6 compatible: only define variables after "{" or at top 2016-07-04 12:08:08 +02:00
Robin Stuart
caa4bb913f Don't add descriptor to EPS and SVG if text is supressed 2016-06-19 14:29:39 +01:00
Robin Stuart
507071cf9c Add CMYK colourspace option for EPS
Requested by Joe Bedard
Ref #22
2016-06-19 14:14:30 +01:00
Robin Stuart
e0240c8e2e Add bold text option for PNG
Fixes #26
Code patch by Christoph Scharenberg
2016-06-19 12:32:49 +01:00
Robin Stuart
d2774af120 Correctly format EAN and UPC without text
EAN and UPC should have a standard compliant format even without text
Fixes #27
2016-06-19 11:59:09 +01:00
Robin Stuart
c709b08da5 Merge branch 'hanxin'
Add new symbology Han Xin according to AIMD-015:2010
Implementation may change when this becomes an ISO standard.
2016-06-19 09:14:52 +01:00
Robin Stuart
55b33cfb88 Han Xin: Comment possible errors in AIMD-015 2016-06-19 09:07:50 +01:00
Robin Stuart
032dee1e0e Han Xin: Add Chinese character (GB18030) modes 2016-05-01 22:10:50 +01:00
Robin Stuart
044b827fff Set default start mode (remove compiler warning) 2016-04-30 14:22:23 +01:00
Robin Stuart
45ce52df25 Display smalltext correctly
Bugfix by C. Scharenberg (Ticket #21)
2016-04-30 12:35:26 +01:00
Robin Stuart
4ae120ab35 Han Xin: Add user options (Version and ECC level) 2016-04-30 10:25:16 +01:00
Robin Stuart
8eb5525c8c Han Xin: Add function information 2016-04-23 15:26:51 +01:00
Robin Stuart
4c7fb647d0 Han Xin: Evaluate and apply bitmask 2016-04-20 20:44:59 +01:00
Robin Stuart
fd0f041f19 Han Xin: Add error correction and codeword interlace 2016-04-16 12:57:45 +01:00
Robin Stuart
7831bda722 Han Xin: Select symbol size and divide binary data into codewords 2016-04-10 20:36:57 +01:00
Robin Stuart
64396488e8 Han Xin: Plot finder and alignment patterns 2016-04-09 17:01:21 +01:00
Robin Stuart
a5440244c4 Han Xin - Add Numeric mode, Text mode and Binary byte mode encoding 2016-04-07 22:30:37 +01:00
Robin Stuart
0230426b0f Add new symbology: Han Xin Code 2016-04-07 17:13:43 +01:00
Harald Oehlmann
0fcf4cc1ab Ticket #18: add some const. 2016-04-06 22:55:14 +02:00
Robin Stuart
5ec95153a0 Populate map for Aztec codes
Ref #17 from hoky24
2016-04-06 09:35:36 +01:00
Harald Oehlmann
90407bffce Removed include malloc.h for all non-Windows so FreeBSD compiles.
Removed include of sys/malloc.h for APPLE, probably not used.
Ticket #18
2016-04-03 22:33:01 +02:00
Robin Stuart
f17f10fa7c Replace local concat() and roundup() with C library defaults
Patch by Oxy (Michael) <virtual_worlds@gmx.de>
Ref: https://sourceforge.net/p/zint/mailman/message/34896811/
2016-03-02 21:12:38 +00:00
Harald Oehlmann
0a034fd5ea Re-replace ceilf() by ceil().
ceilf is better but is C99 which is not supported by my MS-VC6 cpmpiler.
I also suppose, we loose friends if we will rely on C99 features.
If someone has a solution to test if ceilf() exists and use it in this case, I have no troubble, but we need a fall-back.
2016-03-02 11:05:22 +01:00
Robin Stuart
4fb0bb96d9 Bugfix: buffer overrun and mode switch in general field
Ref ticket #15
Bugfix by Vitaly
2016-02-29 20:54:20 +00:00
Robin Stuart
5d9ce6f684 Improvements from Oxy patch
Original email reads...
It does not contain any fundamental changes or new functions but a lot of improvements which I have done over time (added several const/static specifiers, replaced repeated if-conditions by if-else, removed some warnings).
2016-02-29 19:42:32 +00:00
Harald Oehlmann
372994d794 Add Data Matrix Rectangular Extension (DMRE) in regular distribution
- add define "DM_DMRE	101" to zint.h as option_3 value
- add option "-dmre" to command line
- add ckeckbutton "Activate DMRE in automatic mode" to qzint
- make dmatrix.c/dmatrix.h aware of option_3 value DM_DMRE and include DMRE in automatic mode
- Use version 2.5 everywere (as already started by Robin)
- common test case for DMRE in automatic mode is numeric input data with 48 digits, which should lead to a symbol of size 8x64
2016-02-27 21:26:52 +01:00
Harald Oehlmann
0d7ee10ef5 Avoid type definition outside of blocks to be VC6 compatible. 2016-02-24 08:42:15 +01:00
Robin Stuart
7d6050bd3b Allocate memory in Visual Studio friendly way 2016-02-23 19:33:21 +00:00
Robin Stuart
9372aa4e48 Remove int declarations in for loops for Visual Studio 2016-02-23 19:21:48 +00:00
Robin Stuart
cc69851da7 Update developer info 2016-02-22 19:07:09 +00:00
Robin Stuart
65ce7ecc82 Remove dead code 2016-02-20 14:47:11 +00:00
Robin Stuart
6b0b69eb4f Simplify font.h 2016-02-20 14:38:40 +00:00
Robin Stuart
660d8148bd Code format and audit, part 3
Update copyright info, remove unused code, etc.
2016-02-20 11:29:19 +00:00
Robin Stuart
8a88ffdd7b Code format and audit, part 2
Update copyright info, remove unused code, etc.
2016-02-20 10:50:15 +00:00
Robin Stuart
77cdf77690 Code format and audit, part 1
Update copyright info, remove unused code, etc.
2016-02-20 09:38:03 +00:00
Robin Stuart
ae335b104a Alter 'dump' option to give hexadecimal output 2016-02-18 23:23:31 +00:00
Robin Stuart
653105b81d Improved data compression algorithm for QR Code 2016-02-18 12:17:50 +00:00
Robin Stuart
001a0a88d9 Revised data mask scoring
Revision of 4 tests from Table 11, reflecting clarification given in ISO/IEC 18004:2015
2016-02-17 20:31:50 +00:00
Robin Stuart
97a7afa246 Update GS1 Composite name
Code now checked against ISO/IEC 24723:2010
2016-02-17 14:33:17 +00:00
Robin Stuart
0f2abd1c64 Update GS1 DataBar names
To reflect changes made in 2011 revision of ISO/IEC 24724
2016-02-17 13:01:56 +00:00
Robin Stuart
0c42a2473e Revert to UNIX style EOL 2016-02-17 10:52:48 +00:00
Robin Stuart
2e59058615 Avoid possible confusion with Windows error code
Bugfix by Oxy Genic
Ref: https://sourceforge.net/p/zint/mailman/message/34857131/
2016-02-17 10:37:20 +00:00
Robin Stuart
7ae95b2b42 Numeric data correction
Bugfix by Ed Deinstadt
Ref: https://sourceforge.net/p/zint/mailman/message/34362009/
2016-02-13 07:58:59 +00:00
Robin Stuart
a57001d2ad Improved 'look ahead test' from Annex P 2016-02-13 07:37:24 +00:00
Robin Stuart
cbe5b32785 Prevent binary data corruption
Bugfix by Karl Semich
Ref: http://sourceforge.net/p/zint/mailman/message/34330108/
2016-02-07 14:31:58 +00:00
Robin Stuart
6fc43786a1 Improved implementation of Annex P
More closely matches layout of ISO standard for ease of checking and includes corrections
2016-01-16 16:45:08 +00:00
Robin Stuart
0a340a7ca2 Calculate correct number of codeblocks for DataBar ExpStack 2016-01-12 19:42:41 +00:00
Robin Stuart
8569731337 Automatically generate Aztec map
Fixes #2
2016-01-10 17:34:33 +00:00
Robin Stuart
27c7c9447c Avoid segfault generating DataBar Stacked
Do not read element values which have not been initialised when stacking symbol
Fixes #6
2016-01-10 13:24:25 +00:00
Harald Oehlmann
cb6a126bf2 Ticket #4: Instabilities in QR and Micro-QR Codes - fixed by Patch from Philipe Leuba 2016-01-05 10:19:35 +01:00
Harald Oehlmann
4c9570176b Ticket #7: Silence compiler warnings for unused variables 2016-01-05 10:10:52 +01:00
Harald Oehlmann
c120ca49dd DM: Do not double macro character postfix <RS><EOT> 2016-01-04 18:37:34 +01:00
Harald Oehlmann
779894b671 Ticket 12: if(done = 0) corrected 2016-01-04 18:27:53 +01:00
Harald Oehlmann
2a1d6b8e48 Non-latin1 interpretation characters crash png output.
https://sourceforge.net/p/zint/tickets/11/
2016-01-04 18:10:44 +01:00
Harald Oehlmann
a31e562fd4 "Fix stdout handling for png output", 2012-08-06 from fdb8b4e30e 2015-12-07 22:41:40 +01:00
Harald Oehlmann
3aa27d3ccb "Fix compilation with newer libpng versions", 2012-08-06 from ea0812c50b 2015-12-07 22:36:05 +01:00
Harald Oehlmann
ce2950dd7e "gridmtx: Fix EOL bug", 2012-11-11 from 8d3cd0ece0 2015-12-07 22:32:53 +01:00
Harald Oehlmann
1e41540688 "Remove references to dm200", 2012-07-09 on 7c0e950ee0 2015-12-07 22:26:40 +01:00
Harald Oehlmann
f1f6d4ffc6 Remove unreachable statements.
From
8d2ab1bfcf
2015-10-16 14:26:13 +02:00
Harald Oehlmann
603974278b Ticket#1: Code 93: Represent some escaped characters by their direct representation: %,%,+,-,.,/
Patch by Robin Stuart
2015-08-18 19:41:10 +02:00
Harald Oehlmann
fdbe0c6338 rss limited bug fix: finder for checksum 88 added.
Patch by Robin Stuart, ticket: https://github.com/zint/zint/issues/44
2015-08-18 16:16:10 +02:00
Harald Oehlmann
ed1f0bebec Handle NULL for Aztec Symbology (https://sourceforge.net/p/zint/mailman/message/29335201/) 2015-08-18 14:58:30 +02:00
Harald Oehlmann
2215b648f0 Added possibility to not use Datamatrix rectangular extensions 2015-08-18 14:56:55 +02:00
Harald Oehlmann
216eb6c993 Removed DMRE Format 12x48 as it requires special placement algorithm 2015-08-18 14:54:01 +02:00
Harald Oehlmann
b7f9a7a6e4 Changed comment list for placement extension usage matrix sizes 2015-08-18 14:51:40 +02:00
Harald Oehlmann
c86ba22170 Activated row placement wrap-around at the bottom in placement algorithm 2015-08-18 14:50:37 +02:00
Harald Oehlmann
4dc096cd67 Corrected DMRE direct creation with -vers 2015-08-18 14:49:35 +02:00
Harald Oehlmann
30c8df3269 (Patch by Milton Neal) C40/X12 encodation ending rule implemented (may lead to smaller codes) 2015-08-18 14:48:03 +02:00
Harald Oehlmann
6158a95bd5 plessey.c: Loop will never end due to unsinged type (Bug by Philippe Leuba) 2015-08-18 14:46:30 +02:00
Harald Oehlmann
bf687fc409 Same functionality but IMHO nicer because special handling only at one place 2015-08-18 14:38:11 +02:00
Harald Oehlmann
66f112098d Patch by Milton Neal: Do not double forelast character, if it does not fit in a C40 encoding and the last character is shifted (reported by Bertram Wirth) 2015-08-18 14:30:09 +02:00
Harald Oehlmann
32ac8ccbae RSS bug corrected: Character missing for message [01]90614141999996[10]1234222222222221
Patch by Daniel Frede
2015-08-18 14:28:58 +02:00
Harald Oehlmann
b948d9928c Fixed wrong use of _alloca which causes crashes on Windows 2015-08-18 14:27:37 +02:00
Harald Oehlmann
93fa54a784 Wrong length variable used for x12:
Data "P4022.631.50231>SN2743>4LCA>VOPTIM01US>10D2014/7/28" was a spurious "8" appended.
Fix by Milton Neal and Robin Stuart.
2015-08-18 14:26:24 +02:00
Harald Oehlmann
6ad8db3c77 Compile with MS VC6++ avoiding number constant suffix ULI 2015-08-18 14:20:36 +02:00
Harald Oehlmann
994c5adb10 Fix batch bugs: 1) interpretation of former code included in next if shorter, wrong eof detection issed wrong warning 2015-08-18 14:17:59 +02:00
Harald Oehlmann
36a2830562 Corrected definition of DM 16x36. 2015-08-18 14:14:17 +02:00
Harald Oehlmann
5b92413085 Use passed length instead of \0 to detect source string length 2015-08-18 14:11:50 +02:00
Harald Oehlmann
a0f703f7de Revert last commit: also use GS as FNC1: this must be done in zint framework and not here 2015-08-18 14:09:53 +02:00
Harald Oehlmann
0a36297ae3 DM ECC200 Use GS (ASCII 29) beside "[" as FNC1 separator flag character 2015-08-18 14:08:00 +02:00
Harald Oehlmann
8bf4d5906a Implemented DM ECC200 Macro 05/06 encodation 2015-08-18 14:06:06 +02:00
Harald Oehlmann
a9a9473ccf Add DMRE info (only in header) 2015-08-18 14:04:27 +02:00
Harald Oehlmann
1c0066baa9 DMRE: Datamatrix with extended rectangular formats 2015-08-18 13:53:55 +02:00
Harald Oehlmann
b7b7564457 Make command line version compile with MS-VC6 and QT-Version with MS-VC8 2015-08-18 13:50:42 +02:00
Benjamin Kunz
2e5fe31ebf Evaluate QR codes in accordance with ISO 18004 6.8 2013-11-15 16:03:00 +01:00
Benjamin Kunz
d27db1f6e0 unlatch before single ASCII character is required when leaving text encodation. fix for previous revision 2013-05-28 16:23:53 +02:00
Benjamin Kunz
fe7b71ae31 removed unlatch before trailing single-symbol ASCII characters in accordance with specification. this fixes a problem with the symbol size growing larger than required 2013-05-17 10:07:49 +02:00
oxygenic
1a7863520b license changed with permission of original copyright holders (see mailing list for details) 2013-05-16 19:26:38 +02:00
oxygenic
6383e1a4af license changed with permission of original copyright holders (see mailing list for details) 2013-05-16 19:26:22 +02:00
Benjamin Kunz
a0955950d1 Fixed a typo 2013-05-15 11:04:15 +02:00
oxygenic
152c7d32af create static link lib (thanks to Maximilian) 2013-01-10 14:49:04 +01:00
oxygenic
1d241cca05 code cleanup and minor fixes 2012-12-31 14:41:59 +01:00
oxygenic
8c78216dc1 version number updated 2012-12-31 14:41:42 +01:00
oxygenic
4c45bac1ae reworked 2012-12-30 14:55:05 +01:00
openapc
bf2dbe7494 code reworked 2012-12-29 19:37:03 +01:00
openapc
f48d7ab6a6 code reworked 2012-12-29 19:33:43 +01:00
Robin Stuart
5fe18d0ffa Correct ISBN13 check digit
ISBN-13 check digit now correctly identifies '0'.
Thanks to Kévin Sailly.
2011-05-09 09:02:01 +01:00
Robin Stuart
74047434b5 Minor bugfix in Grid Matrix
Grid Matrix doesn't properly set up calculations for byte mode - situation should rarely occur but bug fixed anyway.
Thanks to Tgotic.
2011-05-04 17:30:01 +01:00
Robin Stuart
29edddcf94 Update version to 2.4.2
Update version number to 2.4.2 and remove reference to broken website.
2011-05-02 07:24:09 +01:00
Robin Stuart
a10c11a379 Remove border and box bug in PNG
Minor typo means that barcode binding and boxing doesn't work.
2011-04-18 21:48:55 +01:00
Robin Stuart
89b11d491b Remove references to dm200.c
Thanks to comments11.zint241.ab12@neverbox.com.
2011-03-21 12:02:28 +00:00
Robin Stuart
0871eda1c0 Resolve issues with batch processing.
A couple of minor errors prevented the --batch option from working.
The default output filename (out.png) is now set when encoding.
2011-03-08 11:36:10 +00:00
Robin Stuart
533a5d0453 Resolve bug when Maxicode mode set by user.
If you invoke the program with --mode=2 or --mode=3 zint reports the error
"Invalid Primary String".
Fixed by Travis Waalkens.
2011-03-08 10:33:22 +00:00
Robin Stuart
cc5e18211b Tidy up error correction in Australia Post.
Thanks to Ismael Luceno.
2011-03-08 10:16:18 +00:00
Robin Stuart
30f5b996bf Tidy up check digit function common to 2 of 5 codes.
Thanks to Ismael Luceno.
2011-03-08 09:58:48 +00:00
Robin Stuart
b30f8e110f Corrected error-correction in Code 1
Code 1 now uses correct Reed-Solomon error correction polynomials.
With thanks to Terry Burton.
2011-03-07 12:55:22 +00:00
Robin Stuart
b36542b8f8 Allow PDF417 wider than 22 columns
Stack smashing bug, not enough memory for PDF417 symbols
wider than ~22 columns. Increased memory allocation now
allows up to maximum of 30 columns.
Thanks to Monica Swanson.
2011-01-20 08:27:18 +00:00
Robin Stuart
a760d0dc26 Correction to CC-A
Three column CC-A needs to have Centre RAP after first column.
Thanks to Terry Burton
2011-01-08 23:09:49 +00:00
Robin Stuart
b808ad9494 Adjust error correction levels.
Now encourages error correction levels as recommended in Annex E of ISO/IEC 15438
Thanks to Terry Burton
2011-01-08 22:58:18 +00:00
Robin Stuart
dfa9b59ed2 Composite symbology bugfix
Incorrect row address pattern assignments.
Spotted by Terry Burton
2011-01-03 22:12:07 +00:00
Robin Stuart
0927fa6237 Correct NO_PNG compilation.
Correct a couple of minor omissions which prevented compiling
without PNG support.
2011-01-02 22:01:38 +00:00
Robin Stuart
4f86c12ec4 Correct size of PostNet
Add pitch and height restrictions for rendering PostNet and PLANET symbols.
Thanks to Jim Evans.
2010-12-26 17:43:49 +00:00
Robin Stuart
1c540a6382 Added smalltext option
Added an option which allows use of reduced size text.
Reduced size font information added to font.h.
2010-12-19 22:23:59 +00:00
Robin Stuart
ae44cf2d33 Another QR Code bugfix
QR Code should encode all of the given data, never leave off the last digit!
2010-12-19 16:16:13 +00:00
Robin Stuart
964a178afe Data Matrix bugfix to use all of symbol
Length of encoded data did not map correctly to symbol sizes, Zint now allows up to the maximum capacity in symbols.
Thanks to Andreas Warmer.
2010-12-19 13:55:43 +00:00
Robin Stuart
08a24d9f94 Correct bug in QR Code
Correction of version number bug.
Version information was encoded backwards in QR Code symbols > version 7.
Thanks to Chew Boon Heng and Giovanni Pedruzzi for reporting,
and thanks to Sean Owen from the ZXing group for working out the problem.
2010-12-16 09:54:56 +00:00