diff --git a/backend/raster.c b/backend/raster.c index 5705ed91..31dfa863 100644 --- a/backend/raster.c +++ b/backend/raster.c @@ -1165,7 +1165,8 @@ INTERNAL int plot_raster(struct zint_symbol *symbol, int rotate_angle, int file_ int error; #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; } #endif /* NO_PNG */ diff --git a/backend_tcl/configure.in b/backend_tcl/configure.in index b07053a0..fc99baf0 100644 --- a/backend_tcl/configure.in +++ b/backend_tcl/configure.in @@ -14,7 +14,7 @@ # 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. diff --git a/backend_tcl/lib/zint/pkgIndex.tcl b/backend_tcl/lib/zint/pkgIndex.tcl index 8b4560d1..62b606fe 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.7.1\ +package ifneeded zint 2.8.0\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/readme.txt b/backend_tcl/readme.txt index f9848531..537fb228 100644 --- a/backend_tcl/readme.txt +++ b/backend_tcl/readme.txt @@ -7,16 +7,19 @@ What: tcl binding for zint bar code generator library 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. -- 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: load zint.dll zint help -Most options are identical to the command line tool and are described in the -zint manual. +Most options are identical to the command line tool. +Details may be found in the zint manual. Demo: -The demo folder contains a minimal visual demo program. +The demo folder contains a visual demo program. diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c index efc7f29e..b1ac1282 100644 --- a/backend_tcl/zint.c +++ b/backend_tcl/zint.c @@ -70,7 +70,9 @@ 2020-02-01 2.7.1 HaO - Framework 2.7.1 update 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) @@ -110,7 +112,7 @@ /*----------------------------------------------------------------------------*/ /* > File option defines */ -#define VERSION "2.7.1" +#define VERSION "2.8.0" /*----------------------------------------------------------------------------*/ /* >>>>> Hepler defines */ @@ -224,7 +226,8 @@ static char *s_code_list[] = { "Channel", "CodeOne", "GridMatrix", - "UPNQR", + "UPNQR", + "UltraCode", "rMQR", NULL}; @@ -320,7 +323,8 @@ static int s_code_number[] = { BARCODE_CHANNEL, BARCODE_CODEONE, BARCODE_GRIDMATRIX, - BARCODE_UPNQR, + BARCODE_UPNQR, + BARCODE_ULTRA, BARCODE_RMQR, 0};