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

Removing merge nastynesses

Browse Source
This commit is contained in:
Sam Lown 2010-06-11 20:14:41 +02:00
parent 68de839804
commit 95e51cf96d
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/CMakeLists.txt
View File

@ -4,11 +4,7 @@ project(zint)
find_package(PNG) find_package(PNG)
<<<<<<< HEAD
set(zint_COMMON_SRCS common.c library.c render.c ps.c large.c reedsol.c gs1.c svg.c png.c) set(zint_COMMON_SRCS common.c library.c render.c ps.c large.c reedsol.c gs1.c svg.c png.c)
=======
set(zint_COMMON_SRCS common.c library.c ps.c large.c reedsol.c gs1.c svg.c png.c)
>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
set(zint_ONEDIM_SRCS code.c code128.c 2of5.c upcean.c telepen.c medical.c plessey.c rss.c) set(zint_ONEDIM_SRCS code.c code128.c 2of5.c upcean.c telepen.c medical.c plessey.c rss.c)
set(zint_POSTAL_SRCS postal.c auspost.c imail.c) set(zint_POSTAL_SRCS postal.c auspost.c imail.c)
set(zint_TWODIM_SRCS code16k.c dmatrix.c dm200.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c) set(zint_TWODIM_SRCS code16k.c dmatrix.c dm200.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c)

3
backend/library.c
View File

@ -92,7 +92,6 @@ void ZBarcode_Delete(struct zint_symbol *symbol)
{ {
if (symbol->bitmap != NULL) if (symbol->bitmap != NULL)
free(symbol->bitmap); free(symbol->bitmap);
<<<<<<< HEAD
// If there is a rendered version, ensure it's memory is released // If there is a rendered version, ensure it's memory is released
if (symbol->rendered != NULL) { if (symbol->rendered != NULL) {
@ -118,8 +117,6 @@ void ZBarcode_Delete(struct zint_symbol *symbol)
// Free Render // Free Render
free(symbol->rendered); free(symbol->rendered);
} }
=======
>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
free(symbol); free(symbol);
} }

8
backend/zint.h
View File

@ -25,7 +25,6 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
<<<<<<< HEAD
struct zint_render_line { struct zint_render_line {
float x, y, length, width; float x, y, length, width;
struct zint_render_line *next; /* Pointer to next line */ struct zint_render_line *next; /* Pointer to next line */
@ -44,8 +43,6 @@ struct zint_render {
struct zint_render_string *strings; /* Pointer to first string */ struct zint_render_string *strings; /* Pointer to first string */
}; };
=======
>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
struct zint_symbol { struct zint_symbol {
int symbology; int symbology;
int height; int height;
@ -71,15 +68,10 @@ struct zint_symbol {
char *bitmap; char *bitmap;
int bitmap_width; int bitmap_width;
int bitmap_height; int bitmap_height;
<<<<<<< HEAD
struct zint_render *rendered; struct zint_render *rendered;
}; };
=======
};
>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
/* Tbarcode 7 codes */ /* Tbarcode 7 codes */
#define BARCODE_CODE11 1 #define BARCODE_CODE11 1
#define BARCODE_C25MATRIX 2 #define BARCODE_C25MATRIX 2