Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-28 06:16:03 +00:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/zint.h
View File

@@ -25,7 +25,6 @@
extern "C" {
#endif /* __cplusplus */
<<<<<<< HEAD
struct zint_render_line {
float x, y, length, width;
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 */
};
=======
>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
struct zint_symbol {
int symbology;
int height;
@@ -71,15 +68,10 @@ struct zint_symbol {
char *bitmap;
int bitmap_width;
int bitmap_height;
<<<<<<< HEAD
struct zint_render *rendered;
};
=======
};
>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
/* Tbarcode 7 codes */
#define BARCODE_CODE11 1
#define BARCODE_C25MATRIX 2