diff --git a/CMakeLists.txt b/CMakeLists.txt index cc770171..c03cb06e 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 0) +set (ZINT_VERSION_RELEASE 1) 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 3cb3d083..3d1e6188 100644 --- a/README +++ b/README @@ -77,6 +77,13 @@ Version 2.6.0: Update front end to Qt5. Output to EMF and TIF. Copy to clipboard. Update to latest draft of DMRE. Usual bugfixes. +Version 2.6.1: +Library bugfixes: EDIFACT unlatch in Data Matrix, Add UPNQR, Improved Aztec +data compression, Detect Code 128 data too long, Make error codes consistent. +GUI improvements: Additional clipboard options, remove border width bug, +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. CONTACT US ---------- diff --git a/TODO b/TODO index 42a12f1f..4cd41f85 100644 --- a/TODO +++ b/TODO @@ -3,14 +3,11 @@ If you are interested in improving this package then here are a few ideas. Backend ------- * Create filters for more output file formats. - * Add ECI character support to allow encoding in more languages than are - covered by the Latin-1 character set. * The code was developed to be easy to understand rather than efficient so may benefit from some memory optimisation for embedded systems. GUI Frontend ------------ - * Allow copying of generated barcodes to the clipboard with a "Copy" button. * Allow dragging and dropping to external apps. Packaging @@ -23,10 +20,3 @@ Translations ------------ Documentation is currently only in English. If you have the knowledge and the time please consider translating into other languages. - -Research --------- -The following standards would be welcomed in Zint but the full documentation has -not yet been found: - * DPD Code - * Italian Postal Code diff --git a/backend/2of5.c b/backend/2of5.c index 6f740d51..60010b84 100644 --- a/backend/2of5.c +++ b/backend/2of5.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/DEVELOPER b/backend/DEVELOPER index b3878fc6..478c78a1 100644 --- a/backend/DEVELOPER +++ b/backend/DEVELOPER @@ -59,12 +59,18 @@ composite.c: CC-B Composite Symbology CC-C Composite Symbology +dotcode.c: + Dot Code + dm200.c: Data Matrix ECC 200 gridmtx.c: Grid Matrix +hanxin.c: + Han Xin Code + imail.c: USPS OneCode (Intelligent Mail) @@ -100,6 +106,7 @@ postal.c: qr.c: QR Code Micro QR Code + UPNQR rss.c: GS1 DataBar (DataBar-14) (RSS-14) diff --git a/backend/auspost.c b/backend/auspost.c index c2fc64b5..35438a7c 100644 --- a/backend/auspost.c +++ b/backend/auspost.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/code.c b/backend/code.c index 4386801a..cac63aec 100644 --- a/backend/code.c +++ b/backend/code.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/code128.c b/backend/code128.c index a30903bb..54ccf603 100644 --- a/backend/code128.c +++ b/backend/code128.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Bugfixes thanks to Christian Sakowski and BogDan Vatra Redistribution and use in source and binary forms, with or without diff --git a/backend/code16k.c b/backend/code16k.c index 477eee9c..f4578f38 100644 --- a/backend/code16k.c +++ b/backend/code16k.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/composite.h b/backend/composite.h index e0106f44..c03c11be 100644 --- a/backend/composite.h +++ b/backend/composite.h @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/emf.c b/backend/emf.c index ff01b5e4..94c1425e 100644 --- a/backend/emf.c +++ b/backend/emf.c @@ -1,7 +1,7 @@ /* emf.c - Support for Microsoft Enhanced Metafile Format libzint - the open source barcode library - Copyright (C) 2016 Robin Stuart + Copyright (C) 2016-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/emf.h b/backend/emf.h index 74022e5b..da68522a 100644 --- a/backend/emf.h +++ b/backend/emf.h @@ -1,7 +1,7 @@ /* emf.h - header structure for Microsoft EMF libzint - the open source barcode library - Copyright (C) 2016 Robin Stuart + Copyright (C) 2016-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/hanxin.c b/backend/hanxin.c index a83723d2..2b99650e 100644 --- a/backend/hanxin.c +++ b/backend/hanxin.c @@ -945,7 +945,7 @@ void hx_add_ecc(unsigned char fullstream[], unsigned char datastream[], int vers void make_picket_fence(unsigned char fullstream[], unsigned char picket_fence[], int streamsize) { int i, start; int output_position = 0; - + for (start = 0; start < 13; start++) { for (i = start; i < streamsize; i += 13) { if (i < streamsize) { diff --git a/backend/large.h b/backend/large.h index 818eb9a6..c8b6e14b 100644 --- a/backend/large.h +++ b/backend/large.h @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/maxicode.c b/backend/maxicode.c index 66e61a9b..a0123673 100644 --- a/backend/maxicode.c +++ b/backend/maxicode.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2010-2016 Robin Stuart + Copyright (C) 2010-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/medical.c b/backend/medical.c index b8e518b2..94bd72a3 100644 --- a/backend/medical.c +++ b/backend/medical.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/pcx.h b/backend/pcx.h index b4e1a002..4497cc2e 100644 --- a/backend/pcx.h +++ b/backend/pcx.h @@ -1,7 +1,7 @@ /* pcx.h - header structure for ZSoft PCX files libzint - the open source barcode library - Copyright (C) 2016 Robin Stuart + Copyright (C) 2016-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/plessey.c b/backend/plessey.c index b4ffa013..11548451 100644 --- a/backend/plessey.c +++ b/backend/plessey.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/postal.c b/backend/postal.c index 6f74fddf..1a8844b9 100644 --- a/backend/postal.c +++ b/backend/postal.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Including bug fixes by Bryan Hatton Redistribution and use in source and binary forms, with or without diff --git a/backend/rss.c b/backend/rss.c index 62592df6..c34b615c 100644 --- a/backend/rss.c +++ b/backend/rss.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/rss.h b/backend/rss.h index a09f9a4d..ae47d999 100644 --- a/backend/rss.h +++ b/backend/rss.h @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2007-2016 Robin Stuart + Copyright (C) 2007-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/telepen.c b/backend/telepen.c index 67253597..f82c4d49 100644 --- a/backend/telepen.c +++ b/backend/telepen.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/tif.c b/backend/tif.c index c21f7b99..7b9b3608 100644 --- a/backend/tif.c +++ b/backend/tif.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2016 Robin Stuart + Copyright (C) 2016-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/tif.h b/backend/tif.h index 0de6f1d8..76f19607 100644 --- a/backend/tif.h +++ b/backend/tif.h @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2016 Robin Stuart + Copyright (C) 2016-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/upcean.c b/backend/upcean.c index 8aabf657..d11343c9 100644 --- a/backend/upcean.c +++ b/backend/upcean.c @@ -1,7 +1,7 @@ /* upcean.c - Handles UPC, EAN and ISBN libzint - the open source barcode library - Copyright (C) 2008-2016 Robin Stuart + Copyright (C) 2008-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/zint.h b/backend/zint.h index 369dcb8f..988db7d0 100644 --- a/backend/zint.h +++ b/backend/zint.h @@ -101,7 +101,7 @@ extern "C" { #define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MINOR 6 -#define ZINT_VERSION_RELEASE 0 +#define ZINT_VERSION_RELEASE 1 /* Tbarcode 7 codes */ #define BARCODE_CODE11 1 diff --git a/backend_qt/qzint.cpp b/backend_qt/qzint.cpp index 7866fd3e..ba5815fa 100644 --- a/backend_qt/qzint.cpp +++ b/backend_qt/qzint.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (C) 2008 by BogDan Vatra * * bogdan@licentia.eu * - * Copyright (C) 2010-2016 Robin Stuart * + * Copyright (C) 2010-2017 Robin Stuart * * * * This program is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/docs/manual.txt b/docs/manual.txt index fbaf3b4c..080b6c00 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -2496,6 +2496,11 @@ v2.6 - Output to EMF and TIF. Update frontend to Qt5. Copy to clipboard on KDE and Windows. 12/5/2017 +v2.6.1 - Various bugfixes to backend, including improved Aztec code processing. +Many improvements to GUI including resizable screens and more output while +batch processing, more consistent use of dialogues. +27/8/2017 + 7.4 Sources of Information -------------------------- Below is a list of some of the sources used in rough chronological order: diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp index 8fc0bf6e..da920df8 100644 --- a/frontend_qt/mainwindow.cpp +++ b/frontend_qt/mainwindow.cpp @@ -259,7 +259,7 @@ bool MainWindow::save() void MainWindow::about() { QMessageBox::about(this, tr("About Zint"), - tr("

Zint Barcode Studio 2.6.0

" + tr("

Zint Barcode Studio 2.6.1

" "

A free barcode generator" "

Instruction manual is available at the project homepage:
" "http://www.zint.org.uk" diff --git a/zint.spec b/zint.spec index 9404f64e..155b8a23 100644 --- a/zint.spec +++ b/zint.spec @@ -1,5 +1,5 @@ Name: zint -Version: 2.6.0 +Version: 2.6.1 Release: 2%{?dist} Summary: A barcode generator and library License: GPLv3+ @@ -29,7 +29,7 @@ Features of the library: FNC1 characters. - Support for encoding binary data including NULL (ASCII 0) characters. - Health Industry Barcode (HIBC) encoding capabilities. -- Output in PNG, EPS and SVG formats with user adjustable sizes and colors. +- Output in the following file formats: PNG, GIF, EPS, WMF, BMP, TIF, SVG. - Verification stage for SBN, ISBN and ISBN-13 data. @@ -137,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT %changelog + +* Sun Aug 27 2017 Robin Stuart - 2.6.1 +- Version -> 2.6.1 + * Thu May 11 2017 Robin Stuart - 2.6.0 - Update version number