diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46c4252b..225674c8 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 2)
+set (ZINT_VERSION_RELEASE 3)
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 4ca2f030..69d28a56 100644
--- a/README
+++ b/README
@@ -24,45 +24,6 @@ Output can be saved as BMP, EPS, GIF, PCX, TIF, EMF, PNG or SVG.
PROJECT HISTORY
---------------
-Version 2.3.0:
-This release features a complete rebuild of QR Code and Micro QR Code
-functionality which now:
-
-* Automatically detects and adjusts to Japanese characters
-* Supports GS1 encoding
-* Does not require the qrencode library.
-
-Also new in this release is Grid Matrix support which similarly supports
-Chinese character encoding.
-
-Version 2.3.1:
-Correction of some minor bugs in Code 128 and Data Matrix, addition of
---notext option to CLI and better operation of --scale option which now
-scales human readable text and MaxiCode.
-
-SPECIAL NOTE: Codablock-F has now been REMOVED from this project because of
-problems implimenting this standard. For full details see the project website.
-
-Version 2.3.2:
-More bug corrections including important corrections to RSS Expanded,
-Maxicode and ISBN.
-
-Version 2.4:
-Simplified GUI. Addition of "render" functions provides an API for
-glabels. Corrections to 4-state codes. Simplification in QR code. Added
---dump option and support for reading from stdin.
-
-Version 2.4.1:
-Contains bugfixes for Data Matrix and QR Code. Add option to produce multiple
-files from the command line. Add option to change font size in PNG images.
-Tidy up information for creating Debian packages and for compiling on MS
-Visual Studio. Correct bug preventing compilation without PNG support.
-
-Version 2.4.2:
-Fix bugs in batch processing - this now works from the command line.
-
-Version 2.4.3:
-Some Windows-only fixes and changes
Version 2.5.0:
Support for DotCode and Han Xin code. ECI code processing. Output to BMP, GIF
@@ -89,6 +50,10 @@ Version 2.6.2:
Further bugfixes in Aztec and DotCode. Expand escape sequence support
to API and GUI. Handle UTF BOM. Bugfix raster images of Maxicode.
+Version 2.6.3:
+New symbology Royal Mail 4-state Mailmark. Added North America VIN verification.
+Bugfixes for TIF and EMF output and escape character handling.
+
CONTACT US
----------
The home of Zint is:
diff --git a/backend/zint.h b/backend/zint.h
index 8593e795..cee6d468 100644
--- a/backend/zint.h
+++ b/backend/zint.h
@@ -102,7 +102,7 @@ extern "C" {
#define ZINT_VERSION_MAJOR 2
#define ZINT_VERSION_MINOR 6
-#define ZINT_VERSION_RELEASE 2
+#define ZINT_VERSION_RELEASE 3
/* Tbarcode 7 codes */
#define BARCODE_CODE11 1
diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro
index cfd87a1e..dfe34f03 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.2\\\""
+DEFINES += ZINT_VERSION="\\\"2.6.3\\\""
!contains(DEFINES, NO_PNG) {
INCLUDEPATH += ../../lpng
@@ -117,7 +117,7 @@ SOURCES += ../backend/2of5.c \
../backend/png.c \
qzint.cpp
-VERSION = 2.6.2
+VERSION = 2.6.3
#DESTDIR = .
diff --git a/backend_tcl/configure.in b/backend_tcl/configure.in
index 8dd269e7..b12fcaa9 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.2])
+AC_INIT([zint], [2.6.3])
#--------------------------------------------------------------------
# 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 9199440a..1b9b2530 100644
--- a/backend_tcl/lib/zint/pkgIndex.tcl
+++ b/backend_tcl/lib/zint/pkgIndex.tcl
@@ -1,2 +1,2 @@
-package ifneeded zint 2.6.2\
+package ifneeded zint 2.6.3\
[list load [file join $dir zint[info sharedlibextension]]]
diff --git a/backend_tcl/zint.c b/backend_tcl/zint.c
index 443e8d15..45ee362b 100644
--- a/backend_tcl/zint.c
+++ b/backend_tcl/zint.c
@@ -89,7 +89,7 @@
/*----------------------------------------------------------------------------*/
/* > File option defines */
-#define VERSION "2.6.2"
+#define VERSION "2.6.3"
/*----------------------------------------------------------------------------*/
/* >>>>> Hepler defines */
diff --git a/docs/manual.txt b/docs/manual.txt
index 00ffb407..5c64310d 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -2539,7 +2539,9 @@ v2.6.2 - Further bugfixes in Aztec and DotCode. Expand escape sequence support
to API and GUI. Handle UTF BOM. Bugfix raster images of Maxicode.
22/10/2017
-v2.6.3 - Includes VIN (US) verification. (Forthcoming)
+v2.6.3 - New symbology Royal Mail 4-state Mailmark. Added North America VIN
+verification. Bugfixes for TIF and EMF output and escape character handling.
+15/02/2018
7.4 Sources of Information
--------------------------
diff --git a/frontend/main.c b/frontend/main.c
index 186aa692..b76ab9ed 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -74,7 +74,7 @@ void types(void) {
/* Output usage information */
void usage(void) {
printf( "Zint version %d.%d.%d\n"
- "Encode input data in a barcode and save as a PNG, BMP, GIF, PCX, EPS or SVG file.\n\n"
+ "Encode input data in a barcode and save as BMP/EMF/EPS/GIF/PCX/PNG/SVG/TIF\n\n"
" -b, --barcode=NUMBER Number of barcode type (default is 20 (=Code128)).\n"
" --batch Treat each line of input file as a separate data set\n"
" --bg=COLOUR Specify a background colour (in hex)\n"
@@ -147,7 +147,7 @@ void show_eci(void) {
"28: ** Big-5 (Taiwan) Chinese Character Set\n"
"29: ** GB (PRC) Chinese Character Set\n"
"30: ** Korean Character Set (KSX1001:1998)\n"
- "** See note in section 4.10 of the manual"
+ "** See note in section 4.10 of the manual\n"
);
}
diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp
index e81ad348..93168229 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.2
"
+ tr("Zint Barcode Studio 2.6.3
"
"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_cmdline_vc6.dsp b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp
index 988d7ee6..03d5e7d0 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.2\"" /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.3\"" /c
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
diff --git a/zint.spec b/zint.spec
index 1af2102a..e9240d08 100644
--- a/zint.spec
+++ b/zint.spec
@@ -1,5 +1,5 @@
Name: zint
-Version: 2.6.2
+Version: 2.6.3
Release: 2%{?dist}
Summary: A barcode generator and library
License: GPLv3+
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Feb 15 2018 Robin Stuart - 2.6.3
+- Version -> 2.6.3
+
* Sun Oct 22 2017 Robin Stuat - 2.6.2
- Version -> 2.6.2