Update version to 2.6.2

Plus some tidying up in preperation for new release

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 1)
+set (ZINT_VERSION_RELEASE 2)
 set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" )
 
 add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall)

INSTALL

@@ -1,61 +0,0 @@
-     **********************************************************************
-     * PLEASE NOTE: This is just a simple guide to getting Zint working.  *
-     * More complete documentation is available from the project website: *
-     *                  >>>  http://www.zint.org.uk  <<<                  *
-     **********************************************************************
-
-The easiest way to configure compilation is to take advantage of the CMake
-utilities. You will need to install CMake first. If no Qt libraries are
-installed then CMake will not attempt to build the Zint Barcode Studio
-GUI. Similarly if libpng is not detected then CMake will not attempt to
-compile PNG image support. This method is recommened in most cases, the
-notable exception being MinGW.
-
-Once CMake is installed follow these steps:
-
-	cd build
-	cmake ..
-	make
-	make install
-
-The command line program can be accessed by typing:
-
-	zint {options} -d {data}
-
-Notice that the data needs to be entered after all other options. Any options
-given after the data will be ignored. The GUI can be accessed by typing:
-
-	zint-qt
-
-The MakeFile Method:
-MakeFiles are provided for some systems although this method is now
-deprecated. It compiles and installs the library and CLI only. If you have
-installed Zint using this method before please note that the binaries will
-now install to a different location than version 2.3.0 or earlier (/usr/bin
-rather than /usr/local/bin and /usr/lib rather than /usr/local/lib). This
-makes installation easier on Red Hat based systems (RHEL, CentOS, Fedora
-etc.) and on BSD-like systems (FreeBSD, OpenBSD etc.) and is more correctly
-in line with the LSB.
-
-    *** UNINSTALL ANY PREVIOUS VERSION OF ZINT BEFORE USING THIS METHOD ***
-
-To compile using this method simply run:
-
-	make
-	make install
-
-If compiling on MinGW substitute the Makefile.mingw files for the default
-Makefiles in both the /frontend and /backend folders.
-
-MS Windows:
-Compiling on Cygwin and MinGW are covered above. Compiling with MS Visual
-Studio is more involved!  Full instructions are currently not ready for
-publication but will be placed on the project website as soon as possible.
-
-Mac OSX:
-It is possible to compile Zint using methods similar to those
-given above, but this has not been thoroughly tested yet. An install
-binary for OSX is also in development. As of feb 2012 the easiest way to 
-get zint install on Mac OSX is to use HomeBrew with:
-
-        brew install zint

README

@@ -85,12 +85,20 @@ remove changing background colour bug, remember more settings and make GUI
 more consistent with user expectations. All windows now resizable and more
 information given when batch processing.
 
+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.
+
 CONTACT US
 ----------
-The home of libzint is:
+The home of Zint is:
 
 	<http://www.sourceforge.net/projects/zint>
 
+The code is now also mirrored at:
+
+        <https://github.com/woo-j/zint>
+
 For feature requests or bug reports please either join the mailing list at
 
 	<https://lists.sourceforge.net/lists/listinfo/zint-barcode>
@@ -101,20 +109,17 @@ or add a ticket on the project's SourceForge.
 BEFORE POSTING TO THE LIST
 --------------------------
 Please note the following points...
-* You do not need to join the list to post messages, although joining
+* Zint is primarily developed for Linux. While we have some experience of
-  the list will usually mean your request is answered more promptly.
+  using Zint on Windows we may be unable to resolve problems if they are
-* Zint is primarily developed for Linux. If you are using another platform
+  specific to other operating systems. We cannot provide support for using
-  then we will be less able to help you, although we will do so if we can.
+  Zint with commercial packages such as MS Office or Crystal Reports.
-  We cannot provide support for commercial packages such as MS Office or
-  Crystal Reports.
 * Always ensure you are using the latest version of Zint before posting bug
   reports - the bug you are reporting may have been fixed already.
 * Please remember to state what operating system you are using and include
   enough information to allow us to reproduce the error - including input
   data if appropriate.
 * Please DO NOT post messages asking for us to change the license
-  arrangements. You will be ignored. If you want a barcode encoder with a
+  arrangements. You will be ignored.
-  different license then please look elsewhere.
+* Please remember that Zint is developed by volunteers. While we attempt to
-* Please remember that Zint is developed by volunteers - don't be surprised
+  answer all messages within a week, this is highly dependant on external
-  if we are unable to help you or if it takes a long time to answer your
+  circumstances.
-  questions.

TODO

@@ -5,6 +5,8 @@ Backend
  * Create filters for more output file formats.
  * The code was developed to be easy to understand rather than efficient so may
    benefit from some memory optimisation for embedded systems.
+ * Support for Ultra Code, Super Code and Data Strip desirable, and any other
+   industry symbologies not currently included.
 
 GUI Frontend
 ------------

backend/zint.h

@@ -101,7 +101,7 @@ extern "C" {
 
 #define ZINT_VERSION_MAJOR      2
 #define ZINT_VERSION_MINOR      6
-#define ZINT_VERSION_RELEASE    1
+#define ZINT_VERSION_RELEASE    2
     
     /* Tbarcode 7 codes */
 #define BARCODE_CODE11		1

docs/manual.txt

@@ -592,11 +592,7 @@ size of the symbol. These options are discussed in section 6 of this guide.
 5. Using the API
 ================
 Zint has been written using the C language and currently only has an API for 
-use with C language programs. A wrapper is available for Pascal/Delphi 
+use with C language programs.
-developers thanks to theunknownones from 
-http://theunknownones.googlecode.com/svn/trunk/Components/ZintBarcode/.
-This wrapper, however, is likely to be out of date and may not function as
-expected.
 
 The libzint API has been designed to be very similar to that used by the GNU 
 Barcode package. This allows easy migration from GNU Barcode to Zint. Zint, 
@@ -2504,8 +2500,9 @@ for Code-1 and addition of batch processing at the command line. 19/4/2011 &
 
 v2.4.3 - Includes minor bugfixes 16/5/2011
 
-v2.5 – Support for DotCode and Han Xin code. ECI code processing. Output to 
+v2.5 – Support for DotCode and Han Xin code. Restore support for Codablock-F.
-BMP, GIF and PCX. Added bold text option. Many minor bugfixes and improvements. 
+ECI code processing. Output to BMP, GIF and PCX. Added bold text option. Many
+minor bugfixes and improvements. 
 13/11/2016
 
 v2.6 - Output to EMF and TIF. Update frontend to Qt5. Copy to clipboard on
@@ -2517,6 +2514,10 @@ Many improvements to GUI including resizable screens and more output while
 batch processing, more consistent use of dialogues.
 27/8/2017
 
+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
+
 7.4 Sources of Information
 --------------------------
 Below is a list of some of the sources used in rough chronological order:

frontend_qt/mainwindow.cpp

@@ -259,7 +259,7 @@ bool MainWindow::save()
 void MainWindow::about()
 {
 	QMessageBox::about(this, tr("About Zint"),
-               tr("<h2>Zint Barcode Studio 2.6.1</h2>"
+               tr("<h2>Zint Barcode Studio 2.6.2</h2>"
 					   "<p>A free barcode generator"
                        "<p>Instruction manual is available at the project homepage:<br>"
                        "<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>"

zint.spec

@@ -1,5 +1,5 @@
 Name:      zint
-Version:   2.6.1
+Version:   2.6.2
 Release:   2%{?dist}
 Summary:   A barcode generator and library
 License:   GPLv3+
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Sun Oct 22 2017 Robin Stuat <rstuart114@gmail.com> - 2.6.2
+- Version -> 2.6.2
+
 * Sun Aug 27 2017 Robin Stuart <rstuart114@gmail.com> - 2.6.1
 - Version -> 2.6.1