diff --git a/CMakeLists.txt b/CMakeLists.txt index afa07299..456b31a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,9 @@ project(zint-package) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(ZINT_VERSION_MAJOR 2) -set(ZINT_VERSION_MINOR 14) +set(ZINT_VERSION_MINOR 15) set(ZINT_VERSION_RELEASE 0) -set(ZINT_VERSION_BUILD 9) # Set to 0 before release, set to 9 after release +set(ZINT_VERSION_BUILD 0) # Set to 0 before release, set to 9 after release set(ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}.${ZINT_VERSION_BUILD}") add_definitions(-DZINT_VERSION=\"${ZINT_VERSION}\") diff --git a/ChangeLog b/ChangeLog index 2ae89c67..1d515971 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -Version 2.14.0.9 (dev) not released yet (2025-02-23) -==================================================== +Version 2.15.0 (2025-02-25) +=========================== ***2.14.0 regression fix*** --------------------------- @@ -8,15 +8,12 @@ Version 2.14.0.9 (dev) not released yet (2025-02-23) **Incompatible changes** ------------------------ -- New `text_length` field in `symbol` (useful for new output option - `BARCODE_RAW_TEXT`) +- New `text_length` field in `symbol` Changes ------- - iso4217: remove 191 (HRK), 694 (SLL), 931 (CUC); add 926 (VED) -- Add `text_length` (length of `text`) to `zint_symbol`, and new - `BARCODE_RAW_TEXT` option for `output_options` and new warning - `ZINT_WARN_HRT_RAW_TEXT` for when set when outputting HRT +- Add `text_length` (length of `text`) to `zint_symbol` - PLESSEY: add show default check characters option Bugs diff --git a/README.linux b/README.linux index c7f7f5e0..b4ced16e 100644 --- a/README.linux +++ b/README.linux @@ -23,10 +23,10 @@ or Fedora Then either download the source code tarball - wget -O zint-2.14.0-src.tar.gz \ - https://sourceforge.net/projects/zint/files/zint/2.14.0/zint-2.14.0-src.tar.gz/download - tar xf zint-2.14.0-src.tar.gz - cd zint-2.14.0-src + wget -O zint-2.15.0-src.tar.gz \ + https://sourceforge.net/projects/zint/files/zint/2.15.0/zint-2.15.0-src.tar.gz/download + tar xf zint-2.15.0-src.tar.gz + cd zint-2.15.0-src or clone the latest source diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index 1e8dc985..d4cef76f 100644 --- a/backend/Makefile.mingw +++ b/backend/Makefile.mingw @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.14.0.9\" +ZINT_VERSION:=-DZINT_VERSION=\"2.15.0\" CC:= gcc diff --git a/backend/libzint.rc b/backend/libzint.rc index c79cb83c..932abb09 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,14,0,9 -#define VER_FILEVERSION_STR "2.14.0.9\0" +#define VER_FILEVERSION 2,15,0,0 +#define VER_FILEVERSION_STR "2.15.0.0\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/backend/zint.h b/backend/zint.h index 9a65a7c4..bfc59cd1 100644 --- a/backend/zint.h +++ b/backend/zint.h @@ -31,7 +31,7 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* - * Version: 2.14.0.9 (dev) (see "zintconfig.h") + * Version: 2.15.0 (see "zintconfig.h") * * For documentation, see "../docs/manual.txt" or "../docs/manual.html" or online at * https://zint.org.uk/manual/ diff --git a/backend/zintconfig.h b/backend/zintconfig.h index 6595b239..0d1e3d62 100644 --- a/backend/zintconfig.h +++ b/backend/zintconfig.h @@ -35,9 +35,9 @@ #define ZINTCONFIG_H #define ZINT_VERSION_MAJOR 2 -#define ZINT_VERSION_MINOR 14 +#define ZINT_VERSION_MINOR 15 #define ZINT_VERSION_RELEASE 0 -#define ZINT_VERSION_BUILD 9 +#define ZINT_VERSION_BUILD 0 /* vim: set ts=4 sw=4 et : */ #endif /* ZINTCONFIG_H */ diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index 2d742f43..58ed1116 100644 --- a/backend_qt/backend_qt.pro +++ b/backend_qt/backend_qt.pro @@ -17,7 +17,7 @@ TARGET = QtZint INCLUDEPATH += ../backend #EDIT THIS !!!! -DEFINES += ZINT_VERSION="\\\"2.14.0.9\\\"" +DEFINES += ZINT_VERSION="\\\"2.15.0\\\"" !contains(DEFINES, ZINT_NO_PNG) { INCLUDEPATH += ../../lpng @@ -126,7 +126,7 @@ SOURCES += ../backend/2of5.c \ ../backend/dllversion.c \ qzint.cpp -VERSION = 2.14.0.9 +VERSION = 2.15.0 #DESTDIR = . diff --git a/backend_qt/backend_vc8.pro b/backend_qt/backend_vc8.pro index 0be38b54..328e8cfa 100644 --- a/backend_qt/backend_vc8.pro +++ b/backend_qt/backend_vc8.pro @@ -4,7 +4,7 @@ win32 { } TARGET = QtZint2 -VERSION = 2.14.0.9 +VERSION = 2.15.0 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 diff --git a/backend_tcl/configure b/backend_tcl/configure index 73fa6932..9dd68cda 100755 --- a/backend_tcl/configure +++ b/backend_tcl/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for zint 2.14.0. +# Generated by GNU Autoconf 2.72 for zint 2.15.0. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, @@ -601,8 +601,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='zint' PACKAGE_TARNAME='zint' -PACKAGE_VERSION='2.14.0' -PACKAGE_STRING='zint 2.14.0' +PACKAGE_VERSION='2.15.0' +PACKAGE_STRING='zint 2.15.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1322,7 +1322,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures zint 2.14.0 to adapt to many kinds of systems. +'configure' configures zint 2.15.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1384,7 +1384,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zint 2.14.0:";; + short | recursive ) echo "Configuration of zint 2.15.0:";; esac cat <<\_ACEOF @@ -1486,7 +1486,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zint configure 2.14.0 +zint configure 2.15.0 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -1793,7 +1793,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zint $as_me 2.14.0, which was +It was created by zint $as_me 2.15.0, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -9762,7 +9762,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zint $as_me 2.14.0, which was +This file was extended by zint $as_me 2.15.0, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9817,7 +9817,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -zint config.status 2.14.0 +zint config.status 2.15.0 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/backend_tcl/configure.ac b/backend_tcl/configure.ac index 108efd02..a46de1e5 100644 --- a/backend_tcl/configure.ac +++ b/backend_tcl/configure.ac @@ -19,7 +19,7 @@ dnl to configure the system for the local environment. # so that we create the export library with the dll. #----------------------------------------------------------------------- -AC_INIT([zint],[2.14.0]) +AC_INIT([zint],[2.15.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 f698bedc..365e558e 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.14.0\ +package ifneeded zint 2.15.0\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/zint_tcl.vcxproj b/backend_tcl/zint_tcl.vcxproj index 57918861..96f70ee1 100644 --- a/backend_tcl/zint_tcl.vcxproj +++ b/backend_tcl/zint_tcl.vcxproj @@ -61,7 +61,7 @@ Level3 ProgramDatabase ..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.14.0.9";PACKAGE_VERSION="2.14.0";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.15.0";PACKAGE_VERSION="2.15.0";%(PreprocessorDefinitions) .\Debug\ true .\Debug\zint_tcl.pch @@ -107,7 +107,7 @@ true Level3 ..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.14.0.9";PACKAGE_VERSION="2.14.0";%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.15.0";PACKAGE_VERSION="2.15.0";%(PreprocessorDefinitions) .\Release\ true .\Release\zint_tcl.pch diff --git a/docs/images/gui_appearance.png b/docs/images/gui_appearance.png index 829da292..1878121c 100644 Binary files a/docs/images/gui_appearance.png and b/docs/images/gui_appearance.png differ diff --git a/docs/images/gui_aztec.png b/docs/images/gui_aztec.png index 39a898c6..96f3da06 100644 Binary files a/docs/images/gui_aztec.png and b/docs/images/gui_aztec.png differ diff --git a/docs/images/gui_c25inter.png b/docs/images/gui_c25inter.png index 9caad898..61e8c38d 100644 Binary files a/docs/images/gui_c25inter.png and b/docs/images/gui_c25inter.png differ diff --git a/docs/images/gui_composite.png b/docs/images/gui_composite.png index 355fd3c9..d6ac79e9 100644 Binary files a/docs/images/gui_composite.png and b/docs/images/gui_composite.png differ diff --git a/docs/images/gui_main.png b/docs/images/gui_main.png index a4a60f43..6d6c1831 100644 Binary files a/docs/images/gui_main.png and b/docs/images/gui_main.png differ diff --git a/docs/images/gui_segs.png b/docs/images/gui_segs.png index 771cfb58..59bf501e 100644 Binary files a/docs/images/gui_segs.png and b/docs/images/gui_segs.png differ diff --git a/docs/manual.html b/docs/manual.html index 054344e9..54e78378 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -4,7 +4,7 @@ - + Zint Barcode Generator and Zint Barcode Studio User Manual