From 6751a816a6c988aca6f9cdfbbca9d47a3c72035e Mon Sep 17 00:00:00 2001 From: Harald Oehlmann Date: Wed, 18 Sep 2019 11:58:57 +0200 Subject: [PATCH] 2019-09-19 HaO Set Version to 2.6.6 --- CMakeLists.txt | 2 +- README | 1 + backend/zint.h | 2 +- backend_qt/backend_qt.pro | 4 ++-- backend_tcl/configure.in | 2 +- backend_tcl/lib/zint/pkgIndex.tcl | 2 +- backend_tcl/zint.c | 5 +++-- frontend_qt/mainwindow.cpp | 4 ++-- win32/zint_cmdline_vc6/zint.rc | 10 +++++----- win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp | 2 +- zint.nsi | 2 +- zint.spec | 5 ++++- 12 files changed, 23 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 482aca02..27a2df66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set (ZINT_VERSION_MAJOR 2) set (ZINT_VERSION_MINOR 6) -set (ZINT_VERSION_RELEASE 5) +set (ZINT_VERSION_RELEASE 6) set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" ) add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall) diff --git a/README b/README index e9bbea9a..8aaf34d9 100644 --- a/README +++ b/README @@ -80,6 +80,7 @@ Ticket 155: PDF numeric compaction Ticket 164: crash due to call of svg_plot withnull vector Ticket 119: Crash on bullseye raster drawing qtzint: Micro-QR version option choice corrected (+1 missing). +Datamatrix: code corruption when ECI was encoded and base256 encoding was automatically chosen. CONTACT US ---------- diff --git a/backend/zint.h b/backend/zint.h index 04028460..91119967 100644 --- a/backend/zint.h +++ b/backend/zint.h @@ -136,7 +136,7 @@ extern "C" { #define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MINOR 6 -#define ZINT_VERSION_RELEASE 5 +#define ZINT_VERSION_RELEASE 6 /* Tbarcode 7 codes */ #define BARCODE_CODE11 1 diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index bf22efa6..ff75ff85 100644 --- a/backend_qt/backend_qt.pro +++ b/backend_qt/backend_qt.pro @@ -19,7 +19,7 @@ TARGET = QtZint INCLUDEPATH += ../backend #EDIT THIS !!!! -DEFINES += ZINT_VERSION="\\\"2.6.5\\\"" +DEFINES += ZINT_VERSION="\\\"2.6.6\\\"" !contains(DEFINES, NO_PNG) { INCLUDEPATH += ../../lpng @@ -120,7 +120,7 @@ SOURCES += ../backend/2of5.c \ ../backend/png.c \ qzint.cpp -VERSION = 2.6.5 +VERSION = 2.6.6 #DESTDIR = . diff --git a/backend_tcl/configure.in b/backend_tcl/configure.in index 65badac6..f310de78 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.6.5]) +AC_INIT([zint], [2.6.6]) #-------------------------------------------------------------------- # 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 4fdfcc7e..c886971a 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.6.5\ +package ifneeded zint 2.6.6\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c index 8940237d..004279cf 100644 --- a/backend_tcl/zint.c +++ b/backend_tcl/zint.c @@ -60,7 +60,8 @@ 2019-09-01 2.6.5 HaO - Framework 2.6.5 update - Add option -gssep - + 2019-09-18 2.6.6 HaO + - Framework 2.6.6 update */ #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) @@ -100,7 +101,7 @@ /*----------------------------------------------------------------------------*/ /* > File option defines */ -#define VERSION "2.6.5" +#define VERSION "2.6.6" /*----------------------------------------------------------------------------*/ /* >>>>> Hepler defines */ diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp index 9332a058..a09c528d 100644 --- a/frontend_qt/mainwindow.cpp +++ b/frontend_qt/mainwindow.cpp @@ -265,7 +265,7 @@ bool MainWindow::save() void MainWindow::about() { QMessageBox::about(this, tr("About Zint"), - tr("

Zint Barcode Studio 2.6.5

" + tr("

Zint Barcode Studio 2.6.6

" "

A free barcode generator" "

Instruction manual is available at the project homepage:
" "http://www.zint.org.uk" @@ -283,7 +283,7 @@ void MainWindow::about() "ISO/IEC 15438:2015, ISO/IEC 16022:2006, ISO/IEC 16023:2000,
" "ISO/IEC 16388:2007, ISO/IEC 18004:2015, ISO/IEC 24723:2010,
" "ISO/IEC 24724:2011, ISO/IEC 24728:2006, ISO/IEC 24778:2008,
" - "ISO/IEC 29158:2019, ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000,
" + "ISO/IEC 21471:2019, ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000,
" "ANSI/AIM BC12-1998, AIMD014 (v 1.63), USPS-B-3200" "" diff --git a/win32/zint_cmdline_vc6/zint.rc b/win32/zint_cmdline_vc6/zint.rc index 9d7daeaf..6c044925 100644 --- a/win32/zint_cmdline_vc6/zint.rc +++ b/win32/zint_cmdline_vc6/zint.rc @@ -31,8 +31,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,6,3,0 - PRODUCTVERSION 2,6,3,0 + FILEVERSION 2,6,6,0 + PRODUCTVERSION 2,6,6,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -50,15 +50,15 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "\0" VALUE "FileDescription", "zint barcode generator\0" - VALUE "FileVersion", "2.6.5.0\0" + VALUE "FileVersion", "2.6.6.0\0" VALUE "InternalName", "zint.exe\0" - VALUE "LegalCopyright", "Copyright © 2018 Robin Stuart\0" + VALUE "LegalCopyright", "Copyright © 2019 Robin Stuart\0" VALUE "LegalTrademarks", "\0" VALUE "License", "GNU General Public License version 3\0" VALUE "OriginalFilename", "zint.exe\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "zint\0" - VALUE "ProductVersion", "2.6.5.0\0" + VALUE "ProductVersion", "2.6.6.0\0" VALUE "SpecialBuild", "\0" VALUE "WWW", "http://www.sourceforge.net/projects/zint\0" END diff --git a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp index bbeb8a5b..ac08c982 100644 --- a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp +++ b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.6.5\"" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.6.6\"" /c # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe diff --git a/zint.nsi b/zint.nsi index 82cf4bd7..2787e247 100644 --- a/zint.nsi +++ b/zint.nsi @@ -10,7 +10,7 @@ ;****************************************************************************** !define PRODUCT_NAME "Zint" !define PRODUCT_EXE "qtZint.exe" -!define PRODUCT_VERSION "2.6.4.0" +!define PRODUCT_VERSION "2.6.6.0" !define PRODUCT_WEB_SITE "http://www.zint.org.uk" !define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}" diff --git a/zint.spec b/zint.spec index c7e088bc..a934ba58 100644 --- a/zint.spec +++ b/zint.spec @@ -1,5 +1,5 @@ Name: zint -Version: 2.6.5 +Version: 2.6.6 Release: 2%{?dist} Summary: A barcode generator and library License: GPLv3+ @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 18 2019 Harald Oehlmann - 2.6.6 +- Version -> 2.6.6 + * Mon Sep 1 2019 Harald Oehlmann - 2.6.5 - Version -> 2.6.5