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

615 Commits

Author SHA1 Message Date
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
Harald Oehlmann
a57ef2adc8 2016-10-26 HaO Extended HIBC string length to 112 (HIBC 2.6) 2016-10-26 19:34:21 +02:00
Robin Stuart
cfda2067b1 Improved handling of partial row data
Bug reported by Edgard Lima and fixed by Milton Neal
2016-10-15 10:54:23 +01:00
Robin Stuart
dd80371b17 Enforce DataBar height restrictions 2016-10-14 18:56:49 +01:00
Robin Stuart
d6a1008ae7 Plot pixel buffer the right way up 2016-10-14 16:08:03 +01:00
Robin Stuart
d3b6c9ec07 Remove typo from Grid Matrix codeword dividing table
Bugfix by brunt, Fixes #34
2016-10-09 15:01:16 +01:00
Robin Stuart
ee12f3569b Correction to special case row handling GS1-DataBar Stacked 2016-10-09 14:10:39 +01:00
Robin Stuart
f145680739 Revoke changes made to pixel buffering in API 2016-10-02 10:45:47 +01:00
Robin Stuart
f8b56002c9 Improved processing of CC-C 2016-09-25 11:09:20 +01:00
Harald Oehlmann
a752f2583f Codablock F:
- Fixed crash for negative planed column count.
- Use a square-symbol if no dimensions given, starting at 9 planed characters
2016-09-20 23:19:31 +02:00
Robin Stuart
9eff5cc63a Allow adjustment of dot size when in dotty mode 2016-09-18 14:09:58 +01:00
Robin Stuart
b13efe334a Slight code reduction - use loops when converting to or from binary 2016-09-17 18:22:26 +01:00
Robin Stuart
0dd072437e Add Codablock options to Studio
Also remove divide by zero bug calculating row height
2016-09-17 11:39:01 +01:00
Robin Stuart
c351ed492e Minor tweaks: Don't allow GS1 in Codablock-F, Don't allow negative height rows, Warn user if using ECI mode 2016-09-14 22:34:59 +01:00
Robin Stuart
b49f3f0255 Fix memory leak in PostScript
Also match ZBarcode_Encode prototype with definition
Fixes thanks to Alex Haley <ahaley42@sf>, Ref ticket #33
2016-09-13 21:30:19 +01:00
Harald Oehlmann
343b3b873e Silence nondefined compiler warnings 2016-09-13 08:16:51 +02:00
Robin Stuart
16511da26d Improved rendering of seperator bars for Codablock-F 2016-09-12 21:47:40 +01:00
Harald Oehlmann
7b4009d19f Fixed bugs: C128 arbitrary data, C128 wrong checksum 2016-09-12 15:49:17 +02:00
Harald Oehlmann
2cf489eac2 Make compile with MS-VC6 2016-09-12 13:24:18 +02:00
Robin Stuart
7ae2e68396 Typo-- 2016-09-11 08:47:34 +01:00
Robin Stuart
e0402ba434 Consolidate raster image rotation and colour sanity checks 2016-09-11 08:42:31 +01:00
Robin Stuart
71a30a9031 pack structures in portable fashion, now creates valid bitmap headers for Windows 2016-09-10 18:35:45 +01:00
Robin Stuart
6dbf817ffa Resolve link error LNK2019 in VS
Bugfix by Milton Neal <miltonneal@bigpond.com>
2016-09-10 16:33:08 +01: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
8d3abf8440 Suppress warnings for uninitialized values 2016-09-04 16:35:11 +01:00
Robin Stuart
d86ac40b20 Plot Codablock symbols to file and in Studio 2016-09-04 11:04:41 +01:00
Robin Stuart
a7bcef4ef7 Fix various memory leaks
Bugfixes thanks to Alex Haley <ahaley42@users.sf.net>
2016-09-03 18:45:09 +01:00
Harald Oehlmann
e6ff154543 Codablock F C128 Codeword generation implemented 2016-08-31 16:29:21 +02:00
Robin Stuart
e862bf076c Trying to keep multiple machines synchronised really sucks! 2016-08-29 18:46:52 +01:00
Robin Stuart
f89167c30b Bugfix: Allocate sufficient memory for larger data strings 2016-08-29 18:45:58 +01:00
Robin Stuart
f0d8bb82dc Merge branch 'master' of ssh://git.code.sf.net/p/zint/code 2016-08-28 16:39:13 +01:00
Robin Stuart
8ccde8ad67 Allow DotCode output in EPS 2016-08-28 16:38:02 +01:00
Robin Stuart
3cf8a142b8 Bugfix: Ouput binding in raster images
Also: tidy up use of output_options
2016-08-26 15:13:40 +01:00
Robin Stuart
c6a68dd605 bugfix: Corruption of output_options data 2016-08-26 12:15:54 +01:00
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