renamed png functions

[swftools.git] / src / png2swf.c

diff --git a/src/png2swf.c b/src/png2swf.c
index 91f2188..c24d227 100644 (file)
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -119,7 +119,7 @@ int png_read_chunk(char (*head)[4], int*destlen, U8**destdata, FILE*fi)
        return 0;
     if(!fread(head, 4, 1, fi))
        return 0;
-    len = REVERSESWAP32(len);
+    len = BE_32_TO_NATIVE(len);
     if(destlen) *destlen = len;
     if(destdata) {
        if(len)
@@ -143,7 +143,7 @@ unsigned int png_get_dword(FILE*fi)
 {
     unsigned int a;
     fread(&a,4,1,fi);
-    return REVERSESWAP32(a);
+    return BE_32_TO_NATIVE(a);
 }
 
 struct png_header
@@ -173,8 +173,8 @@ int png_read_header(FILE*fi, struct png_header*header)
        if(!strncasecmp(id, "IHDR", 4)) {
            char a,b,c,f,i;
            if(len < 8) exit(1);
-           header->width = REVERSESWAP32(*(U32*)&data[0]);
-           header->height = REVERSESWAP32(*(U32*)&data[4]);
+           header->width = BE_32_TO_NATIVE(*(U32*)&data[0]);
+           header->height = BE_32_TO_NATIVE(*(U32*)&data[4]);
            a = data[8];      // should be 8
            b = data[9];      // should be 3(indexed), 2(rgb), 0(grayscale) or 6(truecolor+alpha)
 
@@ -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);