Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-27 13:55:57 +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

3
backend/library.c
View File

@@ -92,7 +92,6 @@ 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) {
@@ -118,8 +117,6 @@ void ZBarcode_Delete(struct zint_symbol *symbol)
// Free Render
free(symbol->rendered);
}
=======
>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
free(symbol);
}