diff --git a/backend/library.c b/backend/library.c index 141bd30d..215dc207 100644 --- a/backend/library.c +++ b/backend/library.c @@ -67,7 +67,7 @@ static void set_symbol_defaults(struct zint_symbol *symbol) { symbol->option_1 = -1; symbol->show_hrt = 1; /* Show human readable text */ symbol->input_mode = DATA_MODE; - symbol->eci = 0; /* Default 0 uses ECI 3 */ + /* symbol->eci = 0; Default 0 uses ECI 3 */ symbol->dot_size = 0.8f; /* 0.4 / 0.5 */ symbol->text_gap = 1.0f; symbol->guard_descent = 5.0f; @@ -607,7 +607,7 @@ static const barcode_seg_func_t barcode_seg_funcs[BARCODE_LAST + 1 - LIB_SEG_FUN NULL, NULL, NULL, NULL, NULL, /*130-134*/ NULL, NULL, NULL, NULL, NULL, /*135-139*/ NULL, codeone, gridmatrix, NULL, ultra, /*140-144*/ - rmqr, NULL, /*145-146*/ + rmqr, NULL, NULL, /*145-147*/ }; static int reduced_charset(struct zint_symbol *symbol, struct zint_seg segs[], const int seg_count); diff --git a/backend/libzint.rc b/backend/libzint.rc index e1bff4ad..956c32c8 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -30,7 +30,7 @@ BEGIN VALUE "FileDescription", "libzint barcode library\0" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "zint.dll\0" - VALUE "LegalCopyright", "Copyright © 2024 Robin Stuart & BogDan Vatra\0" + VALUE "LegalCopyright", "Copyright © 2025 Robin Stuart & BogDan Vatra\0" VALUE "OriginalFilename", "zint.dll\0" VALUE "ProductName", "libzint\0" VALUE "ProductVersion", VER_FILEVERSION_STR diff --git a/backend_tcl/licence.txt b/backend_tcl/licence.txt index 0d8dedee..a6f09235 100644 --- a/backend_tcl/licence.txt +++ b/backend_tcl/licence.txt @@ -1,4 +1,4 @@ -Copyright (c) 2024 Robin Stuart +Copyright (c) 2025 Robin Stuart All rights reserved. Redistribution and use in source and binary forms are permitted diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c index d57299c9..2138c734 100644 --- a/backend_tcl/zint.c +++ b/backend_tcl/zint.c @@ -1,7 +1,7 @@ /* zint_tcl.c TCL binding for zint */ /* zint - the open source tcl binding to the zint barcode library - Copyright (C) 2014-2024 Harald Oehlmann + Copyright (C) 2014-2025 Harald Oehlmann Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -178,6 +178,8 @@ - remove the zint command on dll unload 2024-12-23 GL - Added DXFILMEDGE +2025-01-29 GL +- MSVC: suppress warning 4996 (_CRT_SECURE_NO_WARNINGS) */ #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) @@ -193,6 +195,11 @@ #ifdef ERROR_INVALID_DATA #undef ERROR_INVALID_DATA #endif + +#if defined(_MSC_VER) && _MSC_VER > 1200 /* VC6 */ +#pragma warning(disable: 4996) /* function or variable may be unsafe */ +#endif + #endif #include @@ -603,7 +610,7 @@ EXPORT BOOL WINAPI DllEntryPoint (HINSTANCE hInstance, /* Initialisation Procedures */ DLLEXPORT int Zint_Init (Tcl_Interp *interp) { - int * tkFlagPtr; + int *tkFlagPtr; Tcl_CmdInfo info; /*------------------------------------------------------------------------*/ /* If TCL_STUB is not defined, the following only does a version check */ @@ -837,8 +844,8 @@ static int Encode(Tcl_Interp *interp, int objc, int seg_count = 0; int seg_no; Tcl_Obj *pSegDataObjs[10] = {0}; - Tcl_DString segInputs[10]; - struct zint_seg segs[10]; + Tcl_DString segInputs[10] = {{0}}; + struct zint_seg segs[10] = {{0}}; double xdim = 0.0; double resolution = 0.0; /*------------------------------------------------------------------------*/ @@ -1643,8 +1650,8 @@ static int Encode(Tcl_Interp *interp, int objc, Tcl_NewStringObj("Unknown photo image", -1)); fError = 1; } else { - Tk_PhotoImageBlock sImageBlock; - char * pImageRGBA = NULL; + Tk_PhotoImageBlock sImageBlock = {0}; + char *pImageRGBA = NULL; if (my_symbol->alphamap == NULL) { sImageBlock.pixelPtr = (unsigned char *) my_symbol->bitmap; sImageBlock.width = my_symbol->bitmap_width; diff --git a/backend_tcl/zint_tcl.vcxproj b/backend_tcl/zint_tcl.vcxproj index 15e6835c..cbb137e5 100644 --- a/backend_tcl/zint_tcl.vcxproj +++ b/backend_tcl/zint_tcl.vcxproj @@ -44,6 +44,7 @@ .\Debug\ .\Debug\ true + zint .\Release\ @@ -58,9 +59,9 @@ Disabled true Level3 - EditAndContinue - ..\backend;C:\myprograms\tcl9.0\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;PACKAGE_VERSION="2.13.0";%(PreprocessorDefinitions) + 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.13.0.9";PACKAGE_VERSION="2.13.0";%(PreprocessorDefinitions) .\Debug\ true .\Debug\zint_tcl.pch @@ -92,7 +93,7 @@ Console Debug/zint.dll .\Debug\zint.lib - C:\myprograms\tcl9.0\lib;%(AdditionalLibraryDirectories) + C:\Tcl\lib;%(AdditionalLibraryDirectories) odbc32.lib;odbccp32.lib;tclstub.lib;tkstub.lib;%(AdditionalDependencies) @@ -105,8 +106,8 @@ MaxSpeed true Level3 - ..\backend;C:\myprograms\tcl9.0\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;PACKAGE_VERSION="2.13.0";%(PreprocessorDefinitions) + ..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.13.0.9";PACKAGE_VERSION="2.13.0";%(PreprocessorDefinitions) .\Release\ true .\Release\zint_tcl.pch @@ -136,208 +137,67 @@ Console zint.dll .\Release\zint.lib - C:\myprograms\tcl9.0\lib;%(AdditionalLibraryDirectories) + C:\Tcl\lib;%(AdditionalLibraryDirectories) odbc32.lib;odbccp32.lib;tclstub.lib;tkstub.lib;%(AdditionalDependencies) - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - + - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - + + + + - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - + + + - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - + - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - + + + + + + - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - - - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - /D ZINT_VERSION="\"2.13.0.9\"" /D ZINT_VERSION="\"2.13.0.9\"" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/docs/manual.html b/docs/manual.html index 86124074..29318dca 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -985,9 +985,9 @@ class="sourceCode bash">2.5 Zint Tcl Backend

The Tcl backend in the "backend_tcl" sub-directory may be built using the provided TEA (Tcl Extension Architecture) build on -Linux, Windows, macOS and Android. For Windows, an MSVC6 makefile is -also available. See Annex C. Tcl -Backend Binding for further details.

+Linux, Windows, macOS and Android. See Annex C. Tcl Backend Binding +for further details.

3. Using Zint Barcode Studio

Zint Barcode Studio is the graphical user interface for Zint. If you are starting from a command line interface you can start the GUI by @@ -8695,9 +8695,12 @@ class="sourceCode bash">make sudo make install

For Windows, a Microsoft Visual C++ project file is available at -"backend_tcl\zint_tcl.vcxproj". There is also a Visual -Studio makefile available at "backend_tcl\win\makefile.vc", -which can be run with nmake - for details see +"backend_tcl\zint_tcl.vcxproj". Note that this assumes that +Tcl/Tk is available in "C:\Tcl" and that the libraries are +named "tclstub.lib" and "tkstub.lib" - change +to match your setup. There is also a Visual Studio makefile available at +"backend_tcl\win\makefile.vc", which can be run with +nmake - for details see "backend_tcl\win\README.txt".

Once built and installed, invoke the Tcl/Tk CLI "wish":

@@ -8706,7 +8709,7 @@ class="sourceCode bash">and ignoring the Tk window click back to the command prompt "%" and type:

require package zint
+class="sourceCode bash">package require zint
 zint help

which will show the usage message, with options very similiar to the Zint CLI. (One notable difference is that boolean options such as diff --git a/docs/manual.pmd b/docs/manual.pmd index 14cad4f6..9e1345a6 100644 --- a/docs/manual.pmd +++ b/docs/manual.pmd @@ -239,8 +239,7 @@ root directory. The Tcl backend in the `"backend_tcl"` sub-directory may be built using the provided TEA (Tcl Extension Architecture) build on Linux, Windows, macOS and -Android. For Windows, an MSVC6 makefile is also available. See [Annex C. Tcl -Backend Binding] for further details. +Android. See [Annex C. Tcl Backend Binding] for further details. # 3. Using Zint Barcode Studio @@ -5033,9 +5032,11 @@ sudo make install ``` For Windows, a Microsoft Visual C++ project file is available at -`"backend_tcl\zint_tcl.vcxproj"`. There is also a Visual Studio makefile -available at `"backend_tcl\win\makefile.vc"`, which can be run with `nmake` - -for details see `"backend_tcl\win\README.txt"`. +`"backend_tcl\zint_tcl.vcxproj"`. Note that this assumes that Tcl/Tk is +available in `"C:\Tcl"` and that the libraries are named `"tclstub.lib"` and +`"tkstub.lib"` - change to match your setup. There is also a Visual Studio +makefile available at `"backend_tcl\win\makefile.vc"`, which can be run with +`nmake` - for details see `"backend_tcl\win\README.txt"`. Once built and installed, invoke the Tcl/Tk CLI `"wish"`: @@ -5046,7 +5047,7 @@ wish and ignoring the Tk window click back to the command prompt `"%"` and type: ```bash -require package zint +package require zint zint help ``` diff --git a/docs/manual.txt b/docs/manual.txt index 1cc41fee..9c453204 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -416,8 +416,7 @@ root directory. The Tcl backend in the "backend_tcl" sub-directory may be built using the provided TEA (Tcl Extension Architecture) build on Linux, Windows, macOS and -Android. For Windows, an MSVC6 makefile is also available. See Annex C. Tcl -Backend Binding for further details. +Android. See Annex C. Tcl Backend Binding for further details. 3. Using Zint Barcode Studio @@ -4831,8 +4830,10 @@ A Tcl binding is available in the "backend_tcl” sub-directory. To make on Unix sudo make install For Windows, a Microsoft Visual C++ project file is available at -"backend_tcl\zint_tcl.vcxproj". There is also a Visual Studio makefile available -at "backend_tcl\win\makefile.vc", which can be run with nmake - for details see +"backend_tcl\zint_tcl.vcxproj". Note that this assumes that Tcl/Tk is available +in "C:\Tcl" and that the libraries are named "tclstub.lib" and "tkstub.lib" - +change to match your setup. There is also a Visual Studio makefile available at +"backend_tcl\win\makefile.vc", which can be run with nmake - for details see "backend_tcl\win\README.txt". Once built and installed, invoke the Tcl/Tk CLI "wish": @@ -4841,7 +4842,7 @@ Once built and installed, invoke the Tcl/Tk CLI "wish": and ignoring the Tk window click back to the command prompt "%" and type: - require package zint + package require zint zint help which will show the usage message, with options very similiar to the Zint CLI. diff --git a/frontend/zint.rc b/frontend/zint.rc index e80eb2a0..631179d6 100644 --- a/frontend/zint.rc +++ b/frontend/zint.rc @@ -30,7 +30,7 @@ BEGIN VALUE "FileDescription", "zint barcode generator\0" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "zint.exe\0" - VALUE "LegalCopyright", "Copyright © 2024 Robin Stuart & BogDan Vatra\0" + VALUE "LegalCopyright", "Copyright © 2025 Robin Stuart & BogDan Vatra\0" VALUE "OriginalFilename", "zint.exe\0" VALUE "ProductName", "zint\0" VALUE "ProductVersion", VER_FILEVERSION_STR diff --git a/frontend_qt/res/qtZint.rc b/frontend_qt/res/qtZint.rc index 8c1874c1..02a1fc99 100644 --- a/frontend_qt/res/qtZint.rc +++ b/frontend_qt/res/qtZint.rc @@ -58,7 +58,7 @@ BEGIN VALUE "InternalName", "qtZint" - VALUE "LegalCopyright", "Copyright © 2024 Robin Stuart & BogDan Vatra" + VALUE "LegalCopyright", "Copyright © 2025 Robin Stuart & BogDan Vatra" VALUE "License", "GNU General Public License version 3" diff --git a/tools/update_version.php b/tools/update_version.php index 671c8c65..ea54c92b 100644 --- a/tools/update_version.php +++ b/tools/update_version.php @@ -2,7 +2,7 @@ /* Update Zint version number in various files */ /* libzint - the open source barcode library - Copyright (C) 2020-2024 Robin Stuart + Copyright (C) 2020-2025 Robin Stuart */ /* SPDX-License-Identifier: BSD-3-Clause */ @@ -274,9 +274,10 @@ version_replace(1, $data_dirname . 'backend/Makefile.mingw', '/^ZINT_VERSION:=-D version_replace(1, $data_dirname . 'backend_tcl/configure.ac', '/^AC_INIT\(\[zint\],[ \t]*\[/', '/[0-9.]+/', $v_base_str); -// backend_tcl/zint_tcl.dsp +// backend_tcl/zint_tcl.vcxproj -version_replace(2, $data_dirname . 'backend_tcl/zint_tcl.dsp', '/ZINT_VERSION="\\\\"/', '/ZINT_VERSION="\\\\"[0-9.]+\\\\""/', 'ZINT_VERSION="\\"' . $v_str . '\\""'); +version_replace(2, $data_dirname . 'backend_tcl/zint_tcl.vcxproj', '/ZINT_VERSION="/', '/ZINT_VERSION="[0-9.]+"/', 'ZINT_VERSION="' . $v_str . '"'); +version_replace(2, $data_dirname . 'backend_tcl/zint_tcl.vcxproj', '/PACKAGE_VERSION="/', '/PACKAGE_VERSION="[0-9.]+"/', 'PACKAGE_VERSION="' . $v_base_str . '"'); // backend_tcl/lib/zint/pkgIndex.tcl diff --git a/win32/zint_cmdline_vc6/zint.rc b/win32/zint_cmdline_vc6/zint.rc index 6f2a4dfa..4fd7b0d9 100644 --- a/win32/zint_cmdline_vc6/zint.rc +++ b/win32/zint_cmdline_vc6/zint.rc @@ -55,7 +55,7 @@ BEGIN VALUE "FileDescription", "zint barcode generator\0" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "zint.exe\0" - VALUE "LegalCopyright", "Copyright © 2024 Robin Stuart\0" + VALUE "LegalCopyright", "Copyright © 2025 Robin Stuart\0" VALUE "LegalTrademarks", "\0" VALUE "License", "GNU General Public License version 3\0" VALUE "OriginalFilename", "zint.exe\0"