Forwardporting changes for zint barcode support

diff --git a/src/Makefile.am b/src/Makefile.am
index 4ebd3a1c4dfb4185f41e7e288d38435faef57d5a..c35bc7b65ea3e5a65cab88c3168246b7888863c4 100644 (file)
--- 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 5e45d40f66880028bb53c169d52432d6ec858401..3a54aa488a2cf224e1fa0abf4011836e96f439c4 100644 (file)
--- 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);