diff --git a/README b/README
index 0f799366..44395f3a 100644
--- a/README
+++ b/README
@@ -109,11 +109,10 @@ Fixed bugs:
- GS1-128 and RSS may only be used with GS1 contents
- Han Xin chinese character handling
-Version 2.7.1 not released jet:
+Version 2.7.1 2020-02-01:
Changes:
-- Ultracode and colour code support
- QR encoding optimized to get smaller code matrix results
-- PDF417: do not use option_1 to give the maximum number of codewords (928).
+- PDF417: remove obsolete codeword number option in qzint.
Option removed in qtzint.
- Removed annex B (3 digit country codes) and annex C (GS1 General Specification)
from the manual. This material may be found elsewhere.
diff --git a/backend/libzint.rc b/backend/libzint.rc
index 38aa9cba..be47aac4 100644
--- a/backend/libzint.rc
+++ b/backend/libzint.rc
@@ -7,8 +7,8 @@ VS_VERSION_INFO VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO
#endif
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION 2,7,1,0
+ PRODUCTVERSION 2,7,1,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
@@ -25,12 +25,12 @@ BEGIN
//language ID = U.S. English, char set = Windows, Multilingual
BEGIN
VALUE "FileDescription", "libzint barcode library\0"
- VALUE "FileVersion", "2.7.0.0\0"
+ VALUE "FileVersion", "2.7.1.0\0"
VALUE "InternalName", "zint.dll\0"
VALUE "LegalCopyright", "Copyright © 2017 Robin Stuart & BogDan Vatra\0"
VALUE "OriginalFilename", "zint.dll\0"
VALUE "ProductName", "libzint\0"
- VALUE "ProductVersion", "2.7.0.0\0"
+ VALUE "ProductVersion", "2.7.1.0\0"
VALUE "License", "BSD License version 3\0"
VALUE "WWW", "http://www.sourceforge.net/projects/zint"
END
diff --git a/backend/tests/CMakeLists.txt b/backend/tests/CMakeLists.txt
index a3e054e4..3c5932a4 100644
--- a/backend/tests/CMakeLists.txt
+++ b/backend/tests/CMakeLists.txt
@@ -12,7 +12,7 @@ set(ZINT_DEBUG FALSE CACHE BOOL "Set debug compile flag")
set(ZINT_SANITIZE FALSE CACHE BOOL "Set sanitize compile/link flags")
set(ZINT_TEST FALSE CACHE BOOL "Set test compile flag")
-find_package (LibZint 2.7.0 REQUIRED)
+find_package (LibZint 2.7.1 REQUIRED)
find_package(PNG)
if (PNG_FOUND)
diff --git a/backend/zint.h b/backend/zint.h
index 8160a0ed..8686f318 100644
--- a/backend/zint.h
+++ b/backend/zint.h
@@ -137,7 +137,7 @@ extern "C" {
#define ZINT_VERSION_MAJOR 2
#define ZINT_VERSION_MINOR 7
-#define ZINT_VERSION_RELEASE 0
+#define ZINT_VERSION_RELEASE 1
/* Tbarcode 7 codes */
#define BARCODE_CODE11 1
diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro
index b3611e3b..3cc6b13d 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.7.0\\\""
+DEFINES += ZINT_VERSION="\\\"2.7.1\\\""
!contains(DEFINES, NO_PNG) {
INCLUDEPATH += ../../lpng
@@ -125,7 +125,7 @@ SOURCES += ../backend/2of5.c \
../backend/png.c \
qzint.cpp
-VERSION = 2.7.0
+VERSION = 2.7.1
#DESTDIR = .
diff --git a/backend_tcl/configure.in b/backend_tcl/configure.in
index 841791a2..b07053a0 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.0])
+AC_INIT([zint], [2.7.1])
#--------------------------------------------------------------------
# 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 2bc45e4f..8b4560d1 100644
--- a/backend_tcl/lib/zint/pkgIndex.tcl
+++ b/backend_tcl/lib/zint/pkgIndex.tcl
@@ -1,2 +1,2 @@
-package ifneeded zint 2.7.0\
+package ifneeded zint 2.7.1\
[list load [file join $dir zint[info sharedlibextension]]]
diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c
index 7cadc1f3..fd0754c0 100644
--- a/backend_tcl/zint.c
+++ b/backend_tcl/zint.c
@@ -67,6 +67,8 @@
2019-12-05 2.7.0 HaO
- Framework 2.7.0 update
- Add symbology rmqr
+ 2020-02-01 2.7.1 HaO
+ - Framework 2.7.1 update
*/
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@@ -106,7 +108,7 @@
/*----------------------------------------------------------------------------*/
/* > File option defines */
-#define VERSION "2.7.0"
+#define VERSION "2.7.1"
/*----------------------------------------------------------------------------*/
/* >>>>> Hepler defines */
diff --git a/backend_tcl/zint_tcl.dsp b/backend_tcl/zint_tcl.dsp
index f0b0c78c..bdabcac9 100644
--- a/backend_tcl/zint_tcl.dsp
+++ b/backend_tcl/zint_tcl.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\backend" /I "C:\myprograms\tcl8.5\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.7.0\"" /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\backend" /I "C:\myprograms\tcl8.5\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.7.1\"" /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\myprograms\tcl8.5\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.7.0\"" /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\myprograms\tcl8.5\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.7.1\"" /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG"
diff --git a/frontend_qt/Inno_Setup_qtzint.iss b/frontend_qt/Inno_Setup_qtzint.iss
index 4f6acd60..88f3215a 100644
--- a/frontend_qt/Inno_Setup_qtzint.iss
+++ b/frontend_qt/Inno_Setup_qtzint.iss
@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "qtZint"
-#define MyAppVersion "2.7.0"
+#define MyAppVersion "2.7.1"
#define MyAppPublisher "Robin Stuart"
#define MyAppURL "http://zint.org.uk/"
#define MyAppExeName "qtZint.exe"
diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp
index 229d6392..c91f3509 100644
--- a/frontend_qt/mainwindow.cpp
+++ b/frontend_qt/mainwindow.cpp
@@ -264,7 +264,7 @@ bool MainWindow::save()
void MainWindow::about()
{
QMessageBox::about(this, tr("About Zint"),
- tr("Zint Barcode Studio 2.7.0
"
+ tr("Zint Barcode Studio 2.7.1
"
"A free barcode generator"
"
Instruction manual is available at the project homepage:
"
"http://www.zint.org.uk"
diff --git a/zint.nsi b/zint.nsi
index 9bc300fb..a7adc6bd 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.7.0"
+!define PRODUCT_VERSION "2.7.1.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 eac3c2b7..ff7abce2 100644
--- a/zint.spec
+++ b/zint.spec
@@ -1,5 +1,5 @@
Name: zint
-Version: 2.7.0
+Version: 2.7.1
Release: 2%{?dist}
Summary: A barcode generator and library
License: GPLv3+
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Feb 1 2020 Harald Oehlmann - 2.7.1
+- Version -> 2.7.1
+
* Thu Dec 5 2019 Harald Oehlmann - 2.7.0
- Version -> 2.7.0