X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfc.c;h=e34f9fc705c506575d8508d5e592f6addfdebb5b;hp=42db7f412645c8583bf23ffcd003821e2384e248;hb=6f78b0ef3998e959ce09c5ef11d46149756b682b;hpb=922f9285d96ff230c5c6a7017ac7246a0cdf6163

diff --git a/src/swfc.c b/src/swfc.c
index 42db7f4..e34f9fc 100644
--- a/src/swfc.c
+++ b/src/swfc.c
@@ -1465,7 +1465,7 @@ void s_image(const char*name, const char*type, const char*filename, int quality)
     /* step 1: the bitmap */
     SRECT r;
     int imageID = id;
-    int width, height;
+    unsigned width, height;
     if(!strcmp(type,"jpeg")) {
 #ifndef HAVE_JPEGLIB
 	warning("no jpeg support compiled in");
@@ -1493,7 +1493,7 @@ void s_image(const char*name, const char*type, const char*filename, int quality)
 	RGBA*data = 0;
 	swf_SetU16(tag, imageID);
 
-	getPNG(filename, &width, &height, (unsigned char**)&data);
+	png_load(filename, &width, &height, (unsigned char**)&data);
 
 	if(!data) {
 	    syntaxerror("Image \"%s\" not found, or contains errors", filename);
@@ -2691,7 +2691,7 @@ int parseColor2(const char*str, RGBA*color)
 	return 1;
     }
     int len=strlen(str);
-    U8 alpha = 255;
+    int alpha = 255;
     if(strchr(str, '/')) {
 	len = strchr(str, '/')-str;
 	sscanf(str+len+1,"%02x", &alpha);