From: Sam Lown <me@samlown.com>
Date: Mon, 17 May 2010 08:55:06 +0000 (+0200)
Subject: Forwardporting changes for zint barcode support
X-Git-Tag: glabels-2_3_1~213^2~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b8b660ce6a19fd5c32d2311a6afe873c10f399c2;p=glabels

Forwardporting changes for zint barcode support
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 4ebd3a1c..c35bc7b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -123,8 +123,13 @@ glabels_3_SOURCES = 			\
 	bc.h				\
 	bc-gnubarcode.c			\
 	bc-gnubarcode.h			\
+<<<<<<< HEAD
 	bc-zint.c			\
 	bc-zint.h 			\
+=======
+	bc-zint.c		\
+	bc-zint.h 	\
+>>>>>>> Forwardporting changes for zint barcode support
 	bc-postnet.c			\
 	bc-postnet.h			\
 	bc-iec16022.c			\
@@ -250,8 +255,13 @@ glabels_3_batch_SOURCES = 		\
 	bc.h				\
 	bc-gnubarcode.c			\
 	bc-gnubarcode.h			\
+<<<<<<< HEAD
 	bc-zint.c			\
 	bc-zint.h			\
+=======
+	bc-zint.c		\
+	bc-zint.h		\
+>>>>>>> Forwardporting changes for zint barcode support
 	bc-postnet.c			\
 	bc-postnet.h			\
 	bc-iec16022.c			\
diff --git a/src/bc-zint.c b/src/bc-zint.c
index 5e45d40f..3a54aa48 100644
--- a/src/bc-zint.c
+++ b/src/bc-zint.c
@@ -98,7 +98,6 @@ gl_barcode_zint_new (const gchar          *id,
 	symbol->scale = (w / symbol->width);
 	symbol->height = h / symbol->scale; /* height always in standard size */
 
-
 	/* Convert Sums provided by zint encode */
 	gbc = render_zint(symbol, text_flag);