diff --git a/CMakeLists.txt b/CMakeLists.txt index d61a23fe..f9a1227f 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 15) +set(ZINT_VERSION_MINOR 16) 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 d840dd57..bc830c11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -Version 2.15.0.9 (dev) not released yet (2025-12-09) -==================================================== +Version 2.16.0 (2025-12-19) +=========================== **Incompatible changes** ------------------------ @@ -21,6 +21,9 @@ Version 2.15.0.9 (dev) not released yet (2025-12-09) - UPC-E now returns warning if first digit of 7 digits ignored (not '0' or '1') - For GS1 Composite, no primary (linear component) now returns `ZINT_ERROR_INVALID_DATA` (previously returned `ZINT_ERROR_INVALID_OPTION`) +- The distributed Windows binary "zint.exe" is now built with Microsoft Visual + Studio 2015 and requires the Visual C runtime DLL "VCRUNTIME140.dll" + (previously it was built with Visual Studio 6.0) Changes ------- diff --git a/README.bsd b/README.bsd index 15ccc4dc..65c91331 100644 --- a/README.bsd +++ b/README.bsd @@ -1,5 +1,5 @@ -% README.bsd 2025-10-02 -% Tested on FreeBSD 14.3-RELEASE (with X11 + GNOME installed), OpenBSD 7.7 (with X11) and NetBSD 10.1 (with X11) +% README.bsd 2025-12-17 +% Tested on FreeBSD 15.0-RELEASE (with X11 + GNOME installed), OpenBSD 7.8 (with X11) and NetBSD 10.1 (with X11) 1. Prerequisites for building zint ================================== diff --git a/README.clang-tidy b/README.clang-tidy index e1186ea3..8cb3c66e 100644 --- a/README.clang-tidy +++ b/README.clang-tidy @@ -1,4 +1,4 @@ -% README.clang-tidy 2025-10-08 +% README.clang-tidy 2025-12-19 % Current as of latest clang-tidy-22 via % wget https://apt.llvm.org/llvm.sh; chmod +x llvm.sh; sudo ./llvm.sh 22 all @@ -11,7 +11,7 @@ clang-tidy-22 backend/*.c frontend/*.c backend_qt/*.cpp frontend_qt/*.cpp -p bui For "backend_tcl", which has no "compile_commands.json", specify the tcl include directory and package define, e.g. -clang-tidy-22 backend_tcl/*.c -- -I/usr/include/tcl8.6 -DPACKAGE_VERSION='"2.15.0"' +clang-tidy-22 backend_tcl/*.c -- -I/usr/include/tcl8.6 -DPACKAGE_VERSION='"2.16.0"' Options are in ".clang-tidy" (in the project root directory). The excluded check is `clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling` (for `sprintf()`). diff --git a/README.linux b/README.linux index 46f54f5c..812567b9 100644 --- a/README.linux +++ b/README.linux @@ -1,6 +1,6 @@ -% README.linux 2025-10-02 +% README.linux 2025-12-15 % Tested on Ubuntu 20.04.4 LTS, Ubuntu 22.04 LTS, Ubuntu 24.04 LTS and -% Fedora Linux 42 (Workstation Edition) +% Fedora Linux 43 (Workstation Edition) 1. Prerequisites for building zint ================================== @@ -33,10 +33,10 @@ and navigate to "src/c-lib" and make: Now either download the zint source code tarball - 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 + wget -O zint-2.16.0-src.tar.gz \ + https://sourceforge.net/projects/zint/files/zint/2.16.0/zint-2.16.0-src.tar.gz/download + tar xf zint-2.16.0-src.tar.gz + cd zint-2.16.0-src or clone the latest source diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index 6814865a..f8ca0f83 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.15.0.9\" +ZINT_VERSION:=-DZINT_VERSION=\"2.16.0\" CC:= gcc diff --git a/backend/libzint.rc b/backend/libzint.rc index 56649079..b59c40cd 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,15,0,9 -#define VER_FILEVERSION_STR "2.15.0.9\0" +#define VER_FILEVERSION 2,16,0,0 +#define VER_FILEVERSION_STR "2.16.0.0\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/backend/zint.h b/backend/zint.h index d01b20e9..2dea2aff 100644 --- a/backend/zint.h +++ b/backend/zint.h @@ -31,11 +31,11 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* - * Version: 2.15.0.9 (dev) (see "zintconfig.h") + * Version: 2.16.0 (see "zintconfig.h") * * For documentation, see "../docs/manual.txt" or "../docs/manual.html" or the - * PDF manual for 2.15.0 at - * https://sourceforge.net/projects/zint/files/zint/2.15.0/manual.pdf/download + * PDF manual for 2.16.0 at + * https://sourceforge.net/projects/zint/files/zint/2.16.0/manual.pdf/download * or online at * https://zint.org.uk/manual/ */ diff --git a/backend/zintconfig.h b/backend/zintconfig.h index f03a95a3..8f0e5847 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 15 +#define ZINT_VERSION_MINOR 16 #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 ae38f3fe..b95125cb 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.15.0.9\\\"" +DEFINES += ZINT_VERSION="\\\"2.16.0\\\"" INCLUDEPATH += ../../lpng INCLUDEPATH += ../../zlib @@ -127,7 +127,7 @@ SOURCES += ../backend/2of5.c \ ../backend/dllversion.c \ qzint.cpp -VERSION = 2.15.0.9 +VERSION = 2.16.0 #DESTDIR = . diff --git a/backend_qt/backend_vc8.pro b/backend_qt/backend_vc8.pro index 25dc7392..8610aa8d 100644 --- a/backend_qt/backend_vc8.pro +++ b/backend_qt/backend_vc8.pro @@ -4,7 +4,7 @@ win32 { } TARGET = QtZint2 -VERSION = 2.15.0.9 +VERSION = 2.16.0 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 diff --git a/backend_tcl/configure b/backend_tcl/configure index 33dc86f1..18b20f45 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.15.0. +# Generated by GNU Autoconf 2.72 for zint 2.16.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.15.0' -PACKAGE_STRING='zint 2.15.0' +PACKAGE_VERSION='2.16.0' +PACKAGE_STRING='zint 2.16.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1337,7 +1337,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.15.0 to adapt to many kinds of systems. +'configure' configures zint 2.16.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1399,7 +1399,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zint 2.15.0:";; + short | recursive ) echo "Configuration of zint 2.16.0:";; esac cat <<\_ACEOF @@ -1504,7 +1504,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zint configure 2.15.0 +zint configure 2.16.0 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -1811,7 +1811,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.15.0, which was +It was created by zint $as_me 2.16.0, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -10125,7 +10125,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.15.0, which was +This file was extended by zint $as_me 2.16.0, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10180,7 +10180,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.15.0 +zint config.status 2.16.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 52f4ae8b..c5014961 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.15.0]) +AC_INIT([zint],[2.16.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 365e558e..5258cc7f 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.15.0\ +package ifneeded zint 2.16.0\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/win/README.txt b/backend_tcl/win/README.txt index b475e2f6..dd89a0f5 100644 --- a/backend_tcl/win/README.txt +++ b/backend_tcl/win/README.txt @@ -1,18 +1,18 @@ -2025-01-22 +2025-12-16 (C) Harald Oehlmann harald.oehlmann@users.sourceforge.net To build using nmake on Windows: -Download the tcl and tk 8.6.16 or 9.0.1 source from: +Download the tcl and tk 8.6.17 or 9.0.3 source from: https://sourceforge.net/projects/tcl/files/Tcl/ Unzip them into a folder (example: c:\temp) In the following: - is c:\temp\tcl8.6.16 (or 9.0.1) - is c:\temp\tk8.6.16 (or 9.0.1) + is c:\temp\tcl8.6.17 (or 9.0.3) + is c:\temp\tk8.6.17 (or 9.0.3) is the Tcl/Tk install directory (example: c:\Tcl) is the Zint project root directory diff --git a/backend_tcl/zint_tcl.vcxproj b/backend_tcl/zint_tcl.vcxproj index 7ca49732..e4bff19c 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.15.0.9";PACKAGE_VERSION="2.15.0";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.16.0";PACKAGE_VERSION="2.16.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.15.0.9";PACKAGE_VERSION="2.15.0";%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.16.0";PACKAGE_VERSION="2.16.0";%(PreprocessorDefinitions) .\Release\ true .\Release\zint_tcl.pch diff --git a/docs/images/gui_appearance.png b/docs/images/gui_appearance.png index 1878121c..2a11c5af 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 96f3da06..71146ad4 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 61e8c38d..732ccff4 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 d6ac79e9..fe8ec5d4 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 6d6c1831..64a5ea06 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 59bf501e..f53db6b2 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 966f3781..04bba0e7 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -4,7 +4,7 @@ - + Zint Barcode Generator and Zint Barcode Studio User Manual