diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27a2df66..24c396d0 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 6)
+set (ZINT_VERSION_RELEASE 7)
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 8aaf34d9..febfd28b 100644
--- a/README
+++ b/README
@@ -73,7 +73,7 @@ maxicode code set correction
cmake flags for debugging and sanitize options
unit tests for the changes, with a simple test suite based on qrencode/tests
-Version 2.6.6 (not jet released):
+Version 2.6.6:
Fixed bugs:
Ticket 161: PDF row size may be set
Ticket 155: PDF numeric compaction
@@ -82,6 +82,18 @@ 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.
+Version 2.6.7 2019-10-07:
+
+Changes:
+Ticket 127: Allow to code ECI 3 if explicitly given for debug purposes.
+***Incompatible change**
+"--eci 3" now leads to included ECI information.
+"--eci 0" may now be used to not include any ECI information.
+The default of the parameter changed from 3 to 0.
+
+Fixed bugs:
+Ticket 146, 165: fix wrong encoding of RSS composite codes
+
CONTACT US
----------
The home of Zint is:
diff --git a/backend/zint.h b/backend/zint.h
index 91119967..fc4e41a3 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 6
+#define ZINT_VERSION_RELEASE 7
/* Tbarcode 7 codes */
#define BARCODE_CODE11 1
diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro
index ff75ff85..0702f463 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.6\\\""
+DEFINES += ZINT_VERSION="\\\"2.6.7\\\""
!contains(DEFINES, NO_PNG) {
INCLUDEPATH += ../../lpng
@@ -120,7 +120,7 @@ SOURCES += ../backend/2of5.c \
../backend/png.c \
qzint.cpp
-VERSION = 2.6.6
+VERSION = 2.6.7
#DESTDIR = .
diff --git a/backend_tcl/configure.in b/backend_tcl/configure.in
index f310de78..82efba66 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.6])
+AC_INIT([zint], [2.6.7])
#--------------------------------------------------------------------
# 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 c886971a..b08ac9db 100644
--- a/backend_tcl/lib/zint/pkgIndex.tcl
+++ b/backend_tcl/lib/zint/pkgIndex.tcl
@@ -1,2 +1,2 @@
-package ifneeded zint 2.6.6\
+package ifneeded zint 2.6.7\
[list load [file join $dir zint[info sharedlibextension]]]
diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c
index 004279cf..1eebfe5c 100644
--- a/backend_tcl/zint.c
+++ b/backend_tcl/zint.c
@@ -62,6 +62,8 @@
- Add option -gssep
2019-09-18 2.6.6 HaO
- Framework 2.6.6 update
+ 2019-10-07 2.6.7 HaO
+ - Framework 2.6.7 update
*/
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@@ -101,7 +103,7 @@
/*----------------------------------------------------------------------------*/
/* > File option defines */
-#define VERSION "2.6.6"
+#define VERSION "2.6.7"
/*----------------------------------------------------------------------------*/
/* >>>>> Hepler defines */
diff --git a/docs/manual.txt b/docs/manual.txt
index 9f7049a0..44b9aa67 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -434,6 +434,8 @@ The ECI information is added to your code symbol as prefix data.
The ECI-Value may be specified with the --eci switch, followed by the value in the column
"ECI Code".
+The ECI-Value of 0 does not encode any ECI-Information in the code symbol. In this case,
+the default encoding applies for the data which is "ISO-8859-1 - Latin alphabet No. 1".
The first row of the table (ECI code 3) is the default value and does not lead to any ECI
information included into the symbol.
@@ -444,10 +446,15 @@ The rows marked with a star (*) do not do this transformation. The data must be
as binary data (--binary switch) with the data in the encoding given by the "Character
Encoding Scheme" column.
+Note: the "--eci 3" specification may only be used for special purposes. Using this parameter,
+the ECI information is explicitly added to the code symbol. Nevertheless, for ECI Code 3, this
+is not required, as this is the default encoding, which is also active without any ECI
+information.
+
--------------------------------------------------------
ECI Code | Character Encoding Scheme
--------------------------------------------------------
-3 | ISO-8859-1 - Latin alphabet No. 1 (default)
+3 | ISO-8859-1 - Latin alphabet No. 1
4 | ISO-8859-2 - Latin alphabet No. 2
5 | ISO-8859-3 - Latin alphabet No. 3
6 | ISO-8859-4 - Latin alphabet No. 4
diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp
index a09c528d..a358b0b8 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.6
"
+ tr("Zint Barcode Studio 2.6.7
"
"A free barcode generator"
"
Instruction manual is available at the project homepage:
"
"http://www.zint.org.uk"
diff --git a/win32/zint_cmdline_vc6/zint.rc b/win32/zint_cmdline_vc6/zint.rc
index 6c044925..c6f34768 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,6,0
- PRODUCTVERSION 2,6,6,0
+ FILEVERSION 2,6,7,0
+ PRODUCTVERSION 2,6,7,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -50,7 +50,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "zint barcode generator\0"
- VALUE "FileVersion", "2.6.6.0\0"
+ VALUE "FileVersion", "2.6.7.0\0"
VALUE "InternalName", "zint.exe\0"
VALUE "LegalCopyright", "Copyright © 2019 Robin Stuart\0"
VALUE "LegalTrademarks", "\0"
@@ -58,7 +58,7 @@ BEGIN
VALUE "OriginalFilename", "zint.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "zint\0"
- VALUE "ProductVersion", "2.6.6.0\0"
+ VALUE "ProductVersion", "2.6.7.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 ac08c982..f656a6a6 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.6\"" /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.7\"" /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 2787e247..9bc300fb 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.6.0"
+!define PRODUCT_VERSION "2.6.7.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 a934ba58..3ecebafb 100644
--- a/zint.spec
+++ b/zint.spec
@@ -1,5 +1,5 @@
Name: zint
-Version: 2.6.6
+Version: 2.6.7
Release: 2%{?dist}
Summary: A barcode generator and library
License: GPLv3+
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Oct 7 2019 Harald Oehlmann - 2.6.7
+- Version -> 2.6.7
+
* Wed Sep 18 2019 Harald Oehlmann - 2.6.6
- Version -> 2.6.6