mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/zint/code

Browse Source
This commit is contained in:
Robin Stuart 2020-04-07 18:10:27 +01:00
commit d20c6b6b78
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/raster.c
View File

@ -1165,7 +1165,8 @@ INTERNAL int plot_raster(struct zint_symbol *symbol, int rotate_angle, int file_
int error; int error;
#ifdef NO_PNG #ifdef NO_PNG
if (file_type == OUT_PNG_FILE) { if (file_type == OUT_PNG_FILE) {
strcpy(symbol->errtxt, "660: PNG format disabled on compile time");
return ZINT_ERROR_INVALID_OPTION; return ZINT_ERROR_INVALID_OPTION;
} }
#endif /* NO_PNG */ #endif /* NO_PNG */

2
backend_tcl/configure.in
View File

@ -14,7 +14,7 @@
# so you can encode the package version directly into the source files. # so you can encode the package version directly into the source files.
#----------------------------------------------------------------------- #-----------------------------------------------------------------------
AC_INIT([zint], [2.7.1]) AC_INIT([zint], [2.8.0])
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars. # Call TEA_INIT as the first TEA_ macro to set up initial vars.

2
backend_tcl/lib/zint/pkgIndex.tcl
View File

@ -1,2 +1,2 @@
package ifneeded zint 2.7.1\ package ifneeded zint 2.8.0\
[list load [file join $dir zint[info sharedlibextension]]] [list load [file join $dir zint[info sharedlibextension]]]

11
backend_tcl/readme.txt
View File

@ -7,16 +7,19 @@
What: tcl binding for zint bar code generator library What: tcl binding for zint bar code generator library
Build: Build:
The header files of a TCL and Tk build are required for the build.
- MS-VC6 project file "zint_tcl.dsp" may be opened by the GUI. - MS-VC6 project file "zint_tcl.dsp" may be opened by the GUI.
- Linux/Unix build is no issue in principe but is not done jet - Linux/Unix build is provided by the configure script.
Thanks to Christian Werner for that.
Usage: Usage:
load zint.dll load zint.dll
zint help zint help
Most options are identical to the command line tool and are described in the Most options are identical to the command line tool.
zint manual. Details may be found in the zint manual.
Demo: Demo:
The demo folder contains a minimal visual demo program. The demo folder contains a visual demo program.

12
backend_tcl/zint.c
View File

@ -70,7 +70,9 @@
2020-02-01 2.7.1 HaO 2020-02-01 2.7.1 HaO
- Framework 2.7.1 update - Framework 2.7.1 update
2020-04-06 HaO 2020-04-06 HaO
- Added option -fullmultibyte - Added option -fullmultibyte
2020-04-07 2.8.0 HaO
- Added symbology "UltraCode".
*/ */
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@ -110,7 +112,7 @@
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* > File option defines */ /* > File option defines */
#define VERSION "2.7.1" #define VERSION "2.8.0"
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* >>>>> Hepler defines */ /* >>>>> Hepler defines */
@ -224,7 +226,8 @@ static char *s_code_list[] = {
"Channel", "Channel",
"CodeOne", "CodeOne",
"GridMatrix", "GridMatrix",
"UPNQR", "UPNQR",
"UltraCode",
"rMQR", "rMQR",
NULL}; NULL};
@ -320,7 +323,8 @@ static int s_code_number[] = {
BARCODE_CHANNEL, BARCODE_CHANNEL,
BARCODE_CODEONE, BARCODE_CODEONE,
BARCODE_GRIDMATRIX, BARCODE_GRIDMATRIX,
BARCODE_UPNQR, BARCODE_UPNQR,
BARCODE_ULTRA,
BARCODE_RMQR, BARCODE_RMQR,
0}; 0};