From 545ff663d38d9dd4a1b909c9b0f0611bb5b0c50c Mon Sep 17 00:00:00 2001 From: hooper114 Date: Sun, 23 May 2010 07:18:15 +0000 Subject: [PATCH] Update version to 2.3.2 --- CMakeLists.txt | 2 +- backend/Makefile | 4 ++-- backend/Makefile.mingw | 2 +- backend/dm200.c | 15 ++------------- backend/rss.c | 2 ++ frontend/Makefile | 2 +- frontend/Makefile.mingw | 2 +- frontend_qt4/frontend_qt4.pro | 2 ++ frontend_qt4/main.cpp | 1 + frontend_qt4/mainwindow.cpp | 2 +- readme | 15 ++++++++++++--- 11 files changed, 26 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7a109ee..09f42f45 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 3) -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) diff --git a/backend/Makefile b/backend/Makefile index d8003dfc..a27179c5 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.3.1\" +ZINT_VERSION:=-DZINT_VERSION=\"2.3.2\" CC := gcc @@ -33,7 +33,7 @@ libzint: code.c code128.c 2of5.c upcean.c medical.c telepen.c plessey.c postal.c $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(POSTAL) $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(TWODIM) $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(COMMON) - $(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.3.0 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS) + $(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.3.2 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS) ln -s libzint.so.* libzint.so .PHONY: install uninstall clean dist diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index be33a20b..5cb0e83b 100644 --- a/backend/Makefile.mingw +++ b/backend/Makefile.mingw @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.3.1\" +ZINT_VERSION:=-DZINT_VERSION=\"2.3.2\" CC:= gcc diff --git a/backend/dm200.c b/backend/dm200.c index 90052825..f23b4ebd 100644 --- a/backend/dm200.c +++ b/backend/dm200.c @@ -38,17 +38,6 @@ #include "common.h" #include "dm200.h" - // simple checked response malloc -static void *safemalloc(int n) -{ - void *p = malloc(n); - if (!p) { - fprintf(stderr, "Malloc(%d) failed\n", n); - exit(1); - } - return p; -} - // Annex M placement alorithm low level static void ecc200placementbit(int *array, int NR, int NC, int r, int c, int p, char b) { @@ -847,9 +836,9 @@ int data_matrix_200(struct zint_symbol *symbol, unsigned char source[], int leng int x, y, NC, NR, *places; NC = W - 2 * (W / FW); NR = H - 2 * (H / FH); - places = (int*)safemalloc(NC * NR * sizeof(int)); + places = (int*)malloc(NC * NR * sizeof(int)); ecc200placement(places, NR, NC); - grid = (unsigned char*)safemalloc(W * H); + grid = (unsigned char*)malloc(W * H); memset(grid, 0, W * H); for (y = 0; y < H; y += FH) { for (x = 0; x < W; x++) diff --git a/backend/rss.c b/backend/rss.c index 27a5052a..dd7bb4da 100644 --- a/backend/rss.c +++ b/backend/rss.c @@ -36,6 +36,8 @@ The date of publication for these functions is 30 November 2006 */ + +/* Includes numerous bugfixes thanks to Pablo Orduña @ the PIRAmIDE project */ #include #include diff --git a/frontend/Makefile b/frontend/Makefile index fed3d62c..31c293bc 100644 --- a/frontend/Makefile +++ b/frontend/Makefile @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.3.1\" +ZINT_VERSION:=-DZINT_VERSION=\"2.3.2\" CC := gcc INCLUDE := -I/usr/include diff --git a/frontend/Makefile.mingw b/frontend/Makefile.mingw index 02824960..859ac02e 100644 --- a/frontend/Makefile.mingw +++ b/frontend/Makefile.mingw @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.3.1\" +ZINT_VERSION:=-DZINT_VERSION=\"2.3.2\" CC := gcc CFLAGS := -D_WIN32 -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend diff --git a/frontend_qt4/frontend_qt4.pro b/frontend_qt4/frontend_qt4.pro index 3f41850d..2faf3233 100644 --- a/frontend_qt4/frontend_qt4.pro +++ b/frontend_qt4/frontend_qt4.pro @@ -2,6 +2,7 @@ # Automatically generated by qmake (2.01a) sub 29. kol 22:15:57 2009 ###################################################################### + TEMPLATE = app TARGET = DEPENDPATH += . debug release @@ -25,5 +26,6 @@ FORMS += grpAztec.ui \ grpPDF417.ui \ grpQR.ui \ mainWindow.ui +TRANSLATIONS = frontend_de.ts SOURCES += barcodeitem.cpp main.cpp mainwindow.cpp RESOURCES += resources.qrc diff --git a/frontend_qt4/main.cpp b/frontend_qt4/main.cpp index ceda84c3..9d017bbe 100644 --- a/frontend_qt4/main.cpp +++ b/frontend_qt4/main.cpp @@ -21,6 +21,7 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(resources); QApplication app(argc, argv); + MainWindow w; w.show(); return app.exec(); diff --git a/frontend_qt4/mainwindow.cpp b/frontend_qt4/mainwindow.cpp index 0e514062..5383f404 100644 --- a/frontend_qt4/mainwindow.cpp +++ b/frontend_qt4/mainwindow.cpp @@ -178,7 +178,7 @@ bool MainWindow::save() void MainWindow::about() { QMessageBox::about(this, tr("About Zint"), - tr("

Zint Barcode Studio 2.3.1

" + tr("

Zint Barcode Studio 2.3.2

" "

A free barcode generator" "

Visit the Zint Project Homepage for more information." "

Copyright © 2009 Robin Stuart.
" diff --git a/readme b/readme index 5973ea91..e07cc7b3 100644 --- a/readme +++ b/readme @@ -1,4 +1,4 @@ -Zint and libzint 2.3.1 +Zint and libzint 2.3.2 ---------------------- Zint is a suite of programs to allow easy encoding of data in any of the wide range of public domain barcode standards and to allow integration of this capability into your own programs. This version @@ -39,6 +39,9 @@ better operation of --scale option which now scales human readable text and Maxi 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. + COMPILING THE CODE ------------------ The CMake Method: @@ -134,11 +137,17 @@ The home of libzint is: http://www.sourceforge.net/projects/zint -and the home for information about Zint is: +and the home for Zint documentation is: http://www.zint.org.uk -I am keen to hear your ideas / recieve bug reports at robin@zint.org.uk +For feature requests or bug reports please join the mailing list at + + https://lists.sourceforge.net/lists/listinfo/zint-barcode + +or send an e-mail to + + zint-barcode@lists.sourceforge.net Thanks for your interest in libzint. Happy encoding.