mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-29 14:25:23 -04:00
Code Issues Projects Releases Packages 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
commit 68de839804
6 changed files with 22 additions and 0 deletions
backend
library.c

3
backend/library.c
View file

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