mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update version to 2.3.2

Browse Source
This commit is contained in:
hooper114 2010-05-23 07:18:15 +00:00
parent f8b6fb20aa
commit 545ff663d3
11 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set (ZINT_VERSION_MAJOR 2) set (ZINT_VERSION_MAJOR 2)
set (ZINT_VERSION_MINOR 3) 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}" ) set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" )
add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall) add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall)

4
backend/Makefile
View File

@ -6,7 +6,7 @@
# make clean cleans up a previous compilation and any object or editor files # 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 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 $(POSTAL)
$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(TWODIM) $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(TWODIM)
$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(COMMON) $(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 ln -s libzint.so.* libzint.so
.PHONY: install uninstall clean dist .PHONY: install uninstall clean dist

2
backend/Makefile.mingw
View File

@ -6,7 +6,7 @@
# make clean cleans up a previous compilation and any object or editor files # 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 CC:= gcc

15
backend/dm200.c
View File

@ -38,17 +38,6 @@
#include "common.h" #include "common.h"
#include "dm200.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 // Annex M placement alorithm low level
static void ecc200placementbit(int *array, int NR, int NC, int r, int c, int p, char b) 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; int x, y, NC, NR, *places;
NC = W - 2 * (W / FW); NC = W - 2 * (W / FW);
NR = H - 2 * (H / FH); NR = H - 2 * (H / FH);
places = (int*)safemalloc(NC * NR * sizeof(int)); places = (int*)malloc(NC * NR * sizeof(int));
ecc200placement(places, NR, NC); ecc200placement(places, NR, NC);
grid = (unsigned char*)safemalloc(W * H); grid = (unsigned char*)malloc(W * H);
memset(grid, 0, W * H); memset(grid, 0, W * H);
for (y = 0; y < H; y += FH) { for (y = 0; y < H; y += FH) {
for (x = 0; x < W; x++) for (x = 0; x < W; x++)

2
backend/rss.c
View File

@ -37,6 +37,8 @@
The date of publication for these functions is 30 November 2006 The date of publication for these functions is 30 November 2006
*/ */
/* Includes numerous bugfixes thanks to Pablo Orduña @ the PIRAmIDE project */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

2
frontend/Makefile
View File

@ -6,7 +6,7 @@
# make clean cleans up a previous compilation and any object or editor files # 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 CC := gcc
INCLUDE := -I/usr/include INCLUDE := -I/usr/include

2
frontend/Makefile.mingw
View File

@ -6,7 +6,7 @@
# make clean cleans up a previous compilation and any object or editor files # 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 CC := gcc
CFLAGS := -D_WIN32 -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend CFLAGS := -D_WIN32 -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend

2
frontend_qt4/frontend_qt4.pro
View File

@ -2,6 +2,7 @@
# Automatically generated by qmake (2.01a) sub 29. kol 22:15:57 2009 # Automatically generated by qmake (2.01a) sub 29. kol 22:15:57 2009
###################################################################### ######################################################################
TEMPLATE = app TEMPLATE = app
TARGET = TARGET =
DEPENDPATH += . debug release DEPENDPATH += . debug release
@ -25,5 +26,6 @@ FORMS += grpAztec.ui \
grpPDF417.ui \ grpPDF417.ui \
grpQR.ui \ grpQR.ui \
mainWindow.ui mainWindow.ui
TRANSLATIONS = frontend_de.ts
SOURCES += barcodeitem.cpp main.cpp mainwindow.cpp SOURCES += barcodeitem.cpp main.cpp mainwindow.cpp
RESOURCES += resources.qrc RESOURCES += resources.qrc

1
frontend_qt4/main.cpp
View File

@ -21,6 +21,7 @@ int main(int argc, char *argv[])
{ {
Q_INIT_RESOURCE(resources); Q_INIT_RESOURCE(resources);
QApplication app(argc, argv); QApplication app(argc, argv);
MainWindow w; MainWindow w;
w.show(); w.show();
return app.exec(); return app.exec();

2
frontend_qt4/mainwindow.cpp
View File

@ -178,7 +178,7 @@ bool MainWindow::save()
void MainWindow::about() void MainWindow::about()
{ {
QMessageBox::about(this, tr("About Zint"), QMessageBox::about(this, tr("About Zint"),
tr("<h2>Zint Barcode Studio 2.3.1</h2>" tr("<h2>Zint Barcode Studio 2.3.2</h2>"
"<p>A free barcode generator" "<p>A free barcode generator"
"<p>Visit the <a href=\"http://www.zint.org.uk\">Zint Project Homepage</a> for more information." "<p>Visit the <a href=\"http://www.zint.org.uk\">Zint Project Homepage</a> for more information."
"<p>Copyright &copy; 2009 Robin Stuart.<br>" "<p>Copyright &copy; 2009 Robin Stuart.<br>"

15
readme
View File

@ -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 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 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 SPECIAL NOTE: Codablock-F has now been REMOVED from this project because of problems implimenting
this standard. For full details see the project website. 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 COMPILING THE CODE
------------------ ------------------
The CMake Method: The CMake Method:
@ -134,11 +137,17 @@ The home of libzint is:
http://www.sourceforge.net/projects/zint 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 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. Thanks for your interest in libzint.
Happy encoding. Happy encoding.