renamed png functions

[swftools.git] / src / png2swf.c

diff --git a/src/png2swf.c b/src/png2swf.c
index 05366fc..c24d227 100644 (file)
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -454,7 +454,7 @@ void applyfilter1(int mode, U8*src, U8*old, U8*dest, int width)
 
 }
 
-TAG* PNG2Image(TAG*t, U16 id, char*filename, int*width, int*height)
+TAG* PNG2Image(TAG*t, U16 id, char*filename, unsigned*width, unsigned*height)
 {
     char tagid[4];
     U8*data;
@@ -749,7 +749,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     MATRIX m;
     int fs;
 
-    int width=0, height=0;
+    unsigned width=0, height=0;
 
 #ifndef HAVE_JPEGLIB
     if(global.mkjpeg) {
@@ -760,7 +760,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     if(global.mkjpeg) {
 #ifdef HAVE_JPEGLIB
        RGBA*data = 0;
-       getPNG(sname, &width, &height, (unsigned char**)&data);
+       png_load(sname, &width, &height, (unsigned char**)&data);
        if(!data) 
            exit(1);
        if(swf_ImageHasAlpha(data, width, height)) {
@@ -775,7 +775,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 #endif
     } else if(1) {
        RGBA*data = 0;
-       getPNG(sname, &width, &height, (unsigned char**)&data);
+       png_load(sname, &width, &height, (unsigned char**)&data);
        if(!data) 
            exit(1);
        t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS);