Commit Graph

749 Commits

Author SHA1 Message Date
Robin Stuart
68fdae09c3 Prevent possible buffer overrun
Spotted by Milton Neal
2018-04-06 10:50:19 +01:00
Robin Stuart
75803e8aa2 Enhanced data length checks for GS1 data
Brought up to date with revision 18 of the GS1 General Specifications
Enhancement suggested by Roman Schnider <r.schnider@cab.de>
2018-03-30 18:46:33 +01:00
Robin Stuart
e6618f1a1b Allow escape character processing in batch mode
Suggested by Martin Zizka, Fixes #96
2018-03-30 11:40:44 +01:00
Robin Stuart
9a5e5f3a9a Rename variable to avoid keyword in VS 2018-03-30 09:46:54 +01:00
Robin Stuart
57075248ff Remove error correction bug for Australia Post symbols
Bug found by Milton Neal <miltonneal@bigpond.com>
2018-03-15 19:17:34 +00:00
Robin Stuart
749eb55321 Merge branch 'master' of ssh://git.code.sf.net/p/zint/code
Thanks to work being done at SF!
2018-02-15 10:47:59 +00:00
Robin Stuart
ffd1ed2d6b Update version number to 2.6.3 2018-02-15 10:46:02 +00:00
Robin Stuart
8bd26f5e83 Open EMF files in binary mode 2018-02-13 18:32:26 +00:00
Harald Oehlmann
ee763cb135 Do not free _alloca data 2018-02-13 16:53:12 +01:00
Robin Stuart
fa3c150610 Force TIFF to always use more than one strip 2018-02-11 13:01:43 +00:00
Robin Stuart
78d85bd72e Add font size option for SVG and EPS 2018-02-11 09:55:28 +00:00
Robin Stuart
8bb4d2ce86 Improved binary multiplication for large numbers 2018-02-11 08:00:32 +00:00
Robin Stuart
f655eabc12 Add trailing spaces to Mailmark if not present in input data 2018-02-10 07:26:33 +00:00
Robin Stuart
389bcce10f Add Royal Mail Mailmark to front end 2018-02-09 20:55:17 +00:00
Robin Stuart
59116f689d Add new symbology: Royal Mail Mailmark 2018-02-06 20:57:01 +00:00
Robin Stuart
37d3e60c3a Allow lowercase input for VIN codes 2018-02-04 08:42:01 +00:00
Robin Stuart
e737f992b5 Add verification for North America VIN (Vehicle Identification Number) 2018-02-03 18:44:01 +00:00
Robin Stuart
38150ce931 Correctly add leading zeroes to Australia Post symbols
Bug fix by Erik Salaj <eriksalaj@gmail.com>
2018-02-03 11:41:35 +00:00
Robin Stuart
3aeb1ea70a Make EAN and UPC symbols resizable in glabels in accordance with EN 797:1996
As requested by Sebastien Marie <semarie@online.fr>
2018-01-29 19:12:30 +00:00
Robin Stuart
0d4af7a462 Resolve further error message and warning idiosyncrasies 2018-01-21 18:10:42 +00:00
Robin Stuart
d2161ffb20 Make CLI errors more consistent
Should now output errors and warnings in a consistent and predictable fashion. This is not a neat solution, but functional for now.
2018-01-21 14:33:54 +00:00
Robin Stuart
ae57d413bf UTF duplication error
Removes error duplicating UTF data when using ECI 26
2018-01-21 11:50:49 +00:00
Harald Oehlmann
7cb5eec35a Fix -esc crash for windows 2018-01-14 17:47:02 +01:00
Robin Stuart
782a3a6f39 Include terminator in esc processed string
Attempts to fix #89 reported by Matt Johnson
2018-01-13 15:45:26 +00:00
Robin Stuart
670000b7ea Improve wording of error 227
Fixes #87 reported by Ken Yap
2017-12-24 14:51:12 +00:00
Harald Oehlmann
9f50714b44 Added DMRE size 26x40 2017-12-19 19:00:33 +01:00
Robin Stuart
d7ac9cc00f Enforce PostNet and PLANET lengths
Fix suggested by Milton Neal
2017-12-10 19:42:02 +00:00
Robin Stuart
1057bb9fa5 Fix free memory when not allocated
Bug fix by Alex Haley <ahaley@meditech.com>
2017-11-07 20:26:00 +00:00
Robin Stuart
58537edf0a Remove debug message 2017-11-05 14:32:42 +00:00
Robin Stuart
ddce98a1bb Correct processing of escape char mode 2017-11-05 14:27:01 +00:00
Boris Zentner
31cc0ae78a Remove spaces before EOL 2017-10-25 17:23:57 +01:00
Boris Zentner
45441a6da7 Fix mixed unix / windows EOL 2017-10-25 17:15:35 +01:00
Harald Oehlmann
4b03bccba0 Make compile with MS-VC and set release version 2.6.2 in various files
Attention: qtzint.exe core dumpfs for me
2017-10-23 17:07:30 +02:00
Robin Stuart
73c9b502b5 Update version to 2.6.2
Plus some tidying up in preperation for new release
2017-10-22 12:39:37 +01:00
Robin Stuart
29dbb49325 Add escape sequence support to GUI
Also ensures that CR/LF formatted files remain unaltered when importing
Fixes #72 reported by Siniša Sudec
2017-10-22 10:55:50 +01:00
Robin Stuart
0314ca65a8 Move escape character processing into library
And expand to include all 8-bit values.
2017-10-21 12:45:50 +01:00
Jojakim Stahl
aa64c55787 Height / width adjustment for certain symbologies with fixed requirements must be done before calculating the scaler 2017-10-18 11:40:20 +02:00
Jojakim Stahl
2b79940d33 Fixed rendered->height calculation for EAN like barcodes 2017-10-18 11:40:20 +02:00
Jojakim Stahl
3bbc188217 Fixed bug introduced in bfb183e5df with utf8 input be trucated at length - 3 2017-10-18 11:40:20 +02:00
Jojakim Stahl
6b1421b895 Fixed general_rules declaration in composite.c after refactor in commit [4963a7] 2017-10-18 11:40:20 +02:00
Jojakim Stahl
0a913ad9e3 Adding hexagon height to zint_render_hexagon 2017-10-18 11:40:20 +02:00
Jojakim Stahl
c7d6256a6e Free symbol->rendered structures on ZBarcode_Clear and repeated calls of ZBarcode_Render 2017-10-18 11:40:19 +02:00
Robin Stuart
50cbbe391b Merge /u/srachner/zint/ branch master into master
https://sourceforge.net/p/zint/code/merge-requests/4/
2017-10-17 16:49:05 +00:00
Harald Oehlmann
f83e5b1501 Make compile with MS-VC6 2017-10-16 19:26:54 +02:00
Sebastian Rachner
20ccbcd4e4 Check compiler before including malloc.h 2017-10-15 12:29:46 +02:00
Robin Stuart
bfb183e5df Strip BOM from Unicode input data
Fixes #76, reported by Shmupsik
2017-10-09 19:59:02 +01:00
Robin Stuart
4dd31fb674 Reallign bullseye in Maxicode
Centre of bullseye in Maxicode symbols drifted from desired position
when printing scale was increased. Affects raster plotted images (BMP, GIF etc.).
Changes how centre position of bullseye is calculated.
2017-10-09 11:17:11 +01:00
Robin Stuart
5bc7399252 Fix problems encoding binary in Aztec mode
Bugs found by John Mortlock
Fixes #71
2017-10-04 05:05:58 +01:00
Robin Stuart
4c1c180fbf Protect DotCode from dimensions smaller than 5 2017-09-30 17:14:45 +01:00
Robin Stuart
411f083f57 Fix Aztec grid population error
Resolves X-Y coord flipping reported by John Mortlock
Fixes #70
2017-09-30 13:09:21 +01:00
Rodrigo Torres
4963a772db Refactor 2017-09-11 19:21:33 +01:00
Robin Stuart
1882d76b70 Update version to 2.6.1 2017-08-27 09:31:02 +01:00
Robin Stuart
86a0071f09 Show correct ECC in function information 2017-08-14 07:47:50 +01:00
Robin Stuart
1ca01e9322 Make data types for tables consistent across symbologies
..and reduce library binary size slightly
2017-08-09 09:13:37 +01:00
Robin Stuart
50ec72527b Minor tweaks, no change of function 2017-08-07 08:37:02 +01:00
Robin Stuart
1f503f2aca Dedupe error correction code in Aztec 2017-08-06 09:10:00 +01:00
Robin Stuart
608b4b9134 Audit of error codes 2017-07-27 16:01:53 +01:00
Robin Stuart
e81a90bb58 Avoid SIGSEGV on Code 128 input too long 2017-07-26 11:44:47 +01:00
Robin Stuart
24f175b6f6 Flag if DM_SQUARE is used at the same time as symbol size selection 2017-07-26 11:16:54 +01:00
oxy
2e6fb6a109 compile error fixed 2017-07-24 13:44:27 +01:00
oxygenic
91f66ec57d backported 2017-07-24 13:44:27 +01:00
oxygenic
d8330f5d96 back-merged 2017-07-24 13:44:27 +01:00
Robin Stuart
8ca1329fcf Allow ECI 26 in Unicode mode 2017-07-23 18:04:58 +01:00
Robin Stuart
451f0150d8 Expand ECI support and enforce binary mode when ECI is set 2017-07-23 17:59:51 +01:00
Robin Stuart
d818d1aecc Improved Aztec Code bit compression
Somewhat fixes #30 reported by Francois Grieu
2017-07-21 17:56:36 +01:00
Julien Nabet
3257a5c0af cppcheck: fix reports
[backend/bmp.c:133]: (error) Memory leak: bitmap
[backend/bmp.c:126]: (error) Memory leak: bitmap
[backend/composite.c:464]: (error) Array index -1 is out of bounds.
[backend/composite.c:507]: (error) Array index -1 is out of bounds.
[backend/dmatrix.c:962]: (style) Redundant condition: i!=0. 'i==0 || (i!=0 && binary[i-1]!='b')' is equivalent to 'i==0 || binary[i-1]!='b''
[backend/raster.c:122]: (error) Memory leak: rotated_pixbuf
[backend/raster.c:506]: (error) Memory leak: pixelbuf
[frontend/main.c:273]: (error) Uninitialized variable: format_string
[frontend_qt/exportwindow.cpp:103]: (style) Array index 'j' is used before limits check.
2017-07-01 09:49:47 +01:00
Robin Stuart
0d6716a773 Add method for dynamically checking version info
Suggestion by aragon@phat.za.net for python-zint
2017-07-01 09:06:47 +01:00
Robin Stuart
6306228fed Remove unnecessary debug code 2017-06-18 13:03:25 +01:00
Robin Stuart
a085bca168 Revion of ECI number encoding 2017-06-18 13:00:22 +01:00
Robin Stuart
c0e95684a9 Reduce size of Code 49 bit pattern table (no change of functionality) 2017-06-10 10:45:42 +01:00
Robin Stuart
17be0440cc Review of data types to reduce memory usage (no change of functionality) 2017-06-10 10:08:27 +01:00
Robin Stuart
3f7f909644 Simplify PDF binary handling, remove TTF array (no change of functionality) 2017-06-09 22:00:22 +01:00
Robin Stuart
dd2f9e65ba Further tweaks to binary conversion in QR Code 2017-06-06 21:31:03 +01:00
Robin Stuart
47a64047af Harmonise binary conversion and expand ECI support in QR Code 2017-06-06 21:11:11 +01:00
Robin Stuart
241bcedaa1 Remove unnecessary estimate of binary bitlength 2017-06-05 20:05:58 +01:00
Robin Stuart
30272dd955 Use more accurate guess of bit length when calculating smallest available version
Fixes #66, Bug report by jthie
2017-06-05 19:17:22 +01:00
Robin Stuart
7b53fc3469 Include version information in UPNQR symbols
Fixes #65, Bug report by Primož Cerar
2017-05-30 08:40:08 +01:00
Robin Stuart
ffcfe965d1 Merge Update Visual Studio sln
Code by Cosmic Marc https://sourceforge.net/u/cosmarc/
cd65154a36/
Fixes https://sourceforge.net/p/zint/code/merge-requests/2/
2017-05-29 11:11:04 +01:00
Robin Stuart
b3a1b24d18 help the compiler create more efficient code
Patch from Michael <virtual_worlds@gmx.de>
Full text: As usual I have modified only minor things to remove warnigs when compiled as C++ code, have added some const-specifiers where possible to help the compiler create more efficient code and added some static-specifiers to make functions invisible to other modules.
2017-05-29 10:43:47 +01:00
Cosmin Marc
cd65154a36 Update gitignore.
Add to libzint.vcxproj missing files.
Fix missing include in emf.c.
Add x64 configuration.
Change paths to point to extern folder for external libs(lipbng, zlib).
Updated version in rc file.
2017-05-25 20:17:43 +03:00
Robin Stuart
b46bc1f45e Accept UFT-8 input data for UPNQR 2017-05-21 09:20:03 +01:00
Robin Stuart
b426877a4f Add new symbology UPNQR 2017-05-20 23:37:50 +01:00
Robin Stuart
847fa6f332 Update DotCode to latest draft (April 24, 2017) 2017-05-19 21:30:31 +01:00
Robin Stuart
a1327cbd0d Bugfix: Insertion of unlatch character in EDIFACT mode will unlatch immediately, not at the end of the 24-bit block
Fixes #60, Ref: ISO para 5.2.8.2.
Bug report thanks to ice4x800@sf
2017-05-14 18:46:43 +01:00
Robin Stuart
4c8de6399f Deduplicate GB18030 lookup table 2017-05-14 14:43:49 +01:00
Robin Stuart
6d5fcd14f8 Merge branch 'master' of ssh://git.code.sf.net/p/zint/code 2017-05-14 08:15:55 +01:00
Robin Stuart
19c3755ed0 Simplify conversion to binary with common function
No change to functionality
2017-05-14 08:15:08 +01:00
Harald Oehlmann
c52032acb2 Update win c6 makefile and tcl backend to version 2.6.0 2017-05-12 14:16:59 +02:00
Robin Stuart
19ba8a34c4 Update to version 2.6.0 and update copyright to 2017 2017-05-11 21:14:38 +01:00
Robin Stuart
eef59d150e Prevent control characters from corrupting SVG
Bug fix by Maikel Houthuijzen
2017-05-11 20:15:10 +01:00
Robin Stuart
1ec0873caa Extend Unicode support in Han Xin to Supplementary planes (>= U+10000) 2017-04-23 20:15:50 +01:00
Robin Stuart
92f02c8a67 Kanji works better if data is read to symbol :) 2017-04-21 20:38:19 +01:00
Robin Stuart
a8077535b2 Correct Kanji processing in QR Code
Bugfix by Milton Neal <miltonneal@bigpond.com>
2017-04-21 19:55:17 +01:00
Robin Stuart
6f4610aa98 Add verbose mode to output debug info without recompiling 2017-04-11 10:05:38 +01:00
Robin Stuart
5acbffff0d Consistently throw an error if data does not fit in specified size symbol
See ticket #57
2017-04-11 09:26:39 +01:00
Robin Stuart
1ac5298190 Perform calculations on real rather than estimated binary length...
...and get correct values for ECC encoding from table D1.
Bugfixes by Milton Neal
2017-04-10 08:06:53 +01:00
Harald Oehlmann
f7753564cf Codablock: Code A/B character set change corrected 2017-04-03 11:47:39 +02:00
Harald Oehlmann
7494a241ca Bug fix for Ticket 56: Codablock F: [StartA] was coded as [StartA][SHIFT] resulting in wrong Code and illegal memory access to wrong Code128 pattern 2017-03-30 15:23:14 +02:00
Harald Oehlmann
6bc50a943c Delete to rectangular DMRE formats 24x32, 24x36, 26x32, 26x40 which will probably not be in ISO/IEC 21741 2017-03-29 19:48:44 +02:00
Harald Oehlmann
480e514754 Make bakcend/dotcode.c, emf.c and tif.c compile with MS-VC6 2017-03-28 18:06:08 +02:00
Robin Stuart
939d4de4f0 Enforce height of PDF417 rows
Fixes #55, Bugfix by Galen Rice
2017-03-17 17:08:50 +00:00
Boris Zentner
eb1d246a4d The backend/library should not print error messages.
Just return the error in errtxt.
2017-03-11 08:39:22 +00:00
Boris Zentner
22e06ee05a Test only the current row. Do not check bits outside of the barcode or in the next row. 2017-03-11 08:39:10 +00:00
Robin Stuart
7bbb7072b4 Allow X in Telepen Numeric
Bugfix by Milton Neil
2017-03-04 10:00:03 +00:00
Robin Stuart
b2123f78a3 Update PZN to new (as of 2013) PZN-8 standard
Bug fix by Milton Neil
2017-03-04 07:44:32 +00:00
Robin Stuart
726fb64c02 Fix typo in mixed mode string
Bug report by Milton Neil
2017-02-25 07:56:20 +00:00
Robin Stuart
cddf469ac6 Allow encoding HT FS GS RS and CRLF in code set B
Bug reported by Milton Neil <miltonneal@bigpond.com>
2017-02-19 00:09:24 +00:00
Robin Stuart
6a69e97dfe Improved pad character handling routine
Bugfix and code by Milton Neil <miltonneal@bigpond.com>
2017-02-18 22:17:49 +00:00
Boris Zentner
81cadc3cf9 Fix buffer over run, source is similar to local_source but smaller.
So it might be possible to find a plus character in random data behind source.
2017-02-14 19:08:34 +00:00
Boris Zentner
45633751ee Fix of by one error and check only data. Not the zero at the end. 2017-02-14 19:08:20 +00:00
Robin Stuart
025a485ddf Pad only with character 109 when finishing in binary mode
Bug report by Milton Neil
2017-02-14 18:01:48 +00:00
Robin Stuart
a77e448df5 Correctly determine symbol size accoding to section 5.2.2
Bug fix by Milton Neil <miltonneal@bigpond.com>
2017-02-14 11:04:58 +00:00
Boris Zentner
319c7791bc Fix of by one error in maxi_text_process 2017-01-26 19:44:20 +00:00
Robin Stuart
ecb10e6b7d Don't initialise roots beyond end of field
AKA don't use code from draft standards without testing it!
Bug reported by Christian Sakowski
2017-01-22 19:12:11 +00:00
Robin Stuart
f4852b11a8 Calculate addresses correctly if last TIFF strip is full 2016-12-31 10:44:09 +00:00
Robin Stuart
ec8cfcbb76 Add TIFF output option 2016-12-30 20:25:58 +00:00
Robin Stuart
d1e406b7d2 Add enhanced metafile format (EMF) support 2016-12-23 16:48:03 +00:00
Robin Stuart
e7858dfe98 Add version information to zint.h and increment release version
Relates to #51
2016-12-10 09:04:06 +00:00
Robin Stuart
6115a3f8b6 Avoid trying to encode non-EDIFACT characters in EDIFACT mode
Bug report by brunt, revokes commit [dc3626], tickets #44 and #50
2016-11-26 20:10:51 +00:00
Robin Stuart
0dc3b60c2b Counteract inaccuracy of float values in look ahead test
Bug report by brunt, ticket #49
2016-11-26 13:58:54 +00:00
Robin Stuart
08aefa6aea Include string terminator when keeping track of b256 encoded characters
bug report and patch by brunt, ticket #48
2016-11-26 11:38:00 +00:00
Robin Stuart
1d503c54fe Unlatch EDIFACT encodation when buffer is empty
bug report and patch by brunt, ticket #46
2016-11-26 11:28:43 +00:00
Robin Stuart
6af035ba98 Unlatch X12 encodation when there are 2 codewords left in the buffer
bug report by brunt, ticket #45
2016-11-26 11:18:37 +00:00
Robin Stuart
dc36261030 Force unlatch from EDIFACT on illegal character
Bug report and patch by brunt, ticket #44
2016-11-26 09:00:41 +00:00
Robin Stuart
1155683be1 Include last input character in look ahead test
Bug and patch by brunt, ticket #43
2016-11-26 08:44:59 +00:00
Robin Stuart
b003627908 Interpret 4-bit codewords as big-endian for error correction
affects microQR symbol sizes M1 and M3
bug reported by Milton Neal
2016-11-25 22:21:30 +00:00
Robin Stuart
658cdd7a69 Check for too many codewords after remainder in 144x144 symbols
Bug report and patch by brunt, ticket #42
2016-11-25 20:50:35 +00:00
Robin Stuart
886e789090 Add unlatch if C40/Text buffer is empty
also don't read binary marker beyond end of input

Relates to #38 and #41
2016-11-22 22:03:28 +00:00
Robin Stuart
a0493a0d0c Force flush of last two C40 or Text values in buffer
Relates to #38
2016-11-22 20:24:33 +00:00
Robin Stuart
4ea35b9082 Revert last commit, and use more standard compliant solution 2016-11-19 10:16:10 +00:00
Robin Stuart
1d4cead56e Handle partial C40 or Text buffer properly when using Shift characters
Relates to ticket #38 created by Brunt
2016-11-17 22:32:06 +00:00
Robin Stuart
a1fd5bd832 Malloc declaration needed for Visual Studio 2016-11-05 21:06:58 +00:00
Robin Stuart
5992bbf6e5 Malloc declaration needed for Visual Studio 2016-11-05 16:46:24 +00:00
Boris Zentner
b13645fd16 Remove non standard #include <malloc.h> 2016-10-30 20:00:09 +00:00
Robin Stuart
184fb71fe5 [PATCH] Remove non standard #include <malloc.h> 2016-10-30 17:43:10 +00:00
Boris Zentner
8851884ea1 Clear symbol->text without a constant. 2016-10-30 17:41:56 +00:00
Boris Zentner
02c0df93e6 sym->row_height is 200 now clear it more reliable. 2016-10-30 17:41:50 +00:00
Boris Zentner
696b99b1d2 Fix typos 2016-10-30 17:41:21 +00:00
Boris Zentner
1911b28865 Fix off by one error in code_49 2016-10-30 17:10:40 +00:00
Boris Zentner
63a252a573 Remove superfluous code 2016-10-30 17:10:36 +00:00
Boris Zentner
bfb4d3284b nRead is not used on error 2016-10-30 17:10:30 +00:00
Boris Zentner
7ca22f24a4 Remove superfluous code 2016-10-30 17:10:24 +00:00
Boris Zentner
9553e96f8a Fix of by one errors when searching from right to left. 2016-10-30 17:10:12 +00:00
Robin Stuart
4561a66067 Add identifiers to error messages
To ease the debug process
2016-10-28 22:40:40 +01:00
Robin Stuart
d875318b3d Add option to include check digit in UPC/EAN data, and validate before encoding
Fixes #5
2016-10-28 19:43:08 +01:00
Robin Stuart
796af2580f Make MaxiCode scalable in raster files 2016-10-27 17:50:10 +01:00
Robin Stuart
54c0a858ea Don't include empty strings in output SVG 2016-10-27 13:47:32 +01:00
Robin Stuart
20c4509ecd Set fixed row height in Codablock-F 2016-10-27 13:33:19 +01:00
Robin Stuart
5402264ad9 Alterations based on feedback from Wang Yi 2016-10-27 12:35:53 +01:00
Robin Stuart
7ea03123c8 Set minimum row heights 2016-10-27 09:32:12 +01:00