Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-12-19 02:47:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://zint.git.sourceforge.net/gitroot/zint/zint

Browse Source 
Conflicts:
	backend/CMakeLists.txt
	backend/Makefile
	backend/Makefile.mingw
	backend/library.c
	backend/zint.h
This commit is contained in:
Sam Lown
2010-06-11 20:10:55 +02:00
parent 847cd70e32 511fadef30
commit 68de839804
6 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/zint.h
View File

@@ -25,6 +25,7 @@
extern "C" {
#endif /* __cplusplus */
<<<<<<< HEAD
struct zint_render_line {
float x, y, length, width;
struct zint_render_line *next; /* Pointer to next line */
@@ -43,6 +44,8 @@ struct zint_render {
struct zint_render_string *strings; /* Pointer to first string */
};
=======
>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
struct zint_symbol {
int symbology;
int height;
@@ -68,10 +71,15 @@ 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