From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 23 Nov 2012 21:40:50 +0000 (+0200)
Subject: Enable compiler optimizations and fix some warnings
X-Git-Tag: 1.0~2
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=9f548012815fcf17f6bae88e71e4fbd431516c31;p=ttf2png.git

Enable compiler optimizations and fix some warnings
---

diff --git a/Makefile b/Makefile
index 0bc7aad..cfe0ee0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ttf2png: ttf2png.c
-	gcc -Wall -Wextra -Werror -std=c89 -pedantic $^ -o $@ $(shell freetype-config --cflags --libs) $(shell pkg-config --cflags --libs libpng12)
+	gcc -Wall -Wextra -Werror -std=c89 -pedantic -O2 $^ -o $@ $(shell freetype-config --cflags --libs) $(shell pkg-config --cflags --libs libpng12)
 
 VER=0.3
 
diff --git a/ttf2png.c b/ttf2png.c
index e254349..9714ecd 100644
--- a/ttf2png.c
+++ b/ttf2png.c
@@ -320,14 +320,14 @@ void *alloc_image_data(size_t a, size_t b)
 			a += c;
 		if(a<c)
 		{
-			fprintf(stderr, "Cannot allocate %d kbytes of memory for image\n", c/1024*b);
+			fprintf(stderr, "Cannot allocate %lu kbytes of memory for image\n", (unsigned long)(c/1024*b));
 			return NULL;
 		}
 		b /= 2;
 	}
 	ptr = malloc(a);
 	if(!ptr)
-		fprintf(stderr, "Cannot allocate %d kbytes of memory for image\n", a/1024*b);
+		fprintf(stderr, "Cannot allocate %lu kbytes of memory for image\n", (unsigned long)(a/1024*b));
 	return ptr;
 }
 
@@ -727,7 +727,7 @@ int save_png(const char *fn, const Image *image, char alpha)
 	png_info   *pngi;
 	png_byte   **rows;
 	unsigned   i;
-	png_byte   *data2;
+	png_byte   *data2 = 0;
 	int        color;
 
 	if(!strcmp(fn, "-"))