1
0
mirror of https://github.com/woo-j/zint.git synced 2024-12-26 07:21:31 +03:00
Commit Graph

93 Commits

Author SHA1 Message Date
Robin Stuart
23a990c37c Ensure ECI encoding doesn't corrupt binary data in Data Matrix
Fixes #105 reported by Daniel Gredler
2018-06-20 23:47:06 +01:00
Harald Oehlmann
3853897d88 Do not apply rect/dmre options if concrete size is given. E.g. "zint -b72 --vers 31" will ignore eventual option "--square or --dmre". 2018-04-08 20:20:56 +02: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
f83e5b1501 Make compile with MS-VC6 2017-10-16 19:26:54 +02:00
Rodrigo Torres
4963a772db Refactor 2017-09-11 19:21:33 +01:00
Robin Stuart
50ec72527b Minor tweaks, no change of function 2017-08-07 08:37:02 +01:00
Robin Stuart
608b4b9134 Audit of error codes 2017-07-27 16:01:53 +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
oxygenic
d8330f5d96 back-merged 2017-07-24 13:44:27 +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
a085bca168 Revion of ECI number encoding 2017-06-18 13:00:22 +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
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
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
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
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
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
4561a66067 Add identifiers to error messages
To ease the debug process
2016-10-28 22:40:40 +01:00
Harald Oehlmann
2cf489eac2 Make compile with MS-VC6 2016-09-12 13:24:18 +02:00
Robin Stuart
2c2200a7cb modifications for VS2015, some
additional static/const's and a few bugfixes for HanXin and DotStream.

Patch by Michael <virtual_worlds@gmx.de>
2016-09-05 22:06:50 +01:00
Robin Stuart
9d1c20201d Add ECI encoding 2016-08-16 12:43:41 +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
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
044b827fff Set default start mode (remove compiler warning) 2016-04-30 14:22:23 +01: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
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
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
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
a57001d2ad Improved 'look ahead test' from Annex P 2016-02-13 07:37:24 +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
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
216eb6c993 Removed DMRE Format 12x48 as it requires special placement algorithm 2015-08-18 14:54:01 +02:00