X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpng.c;h=49c3c3d0d6a50f1bd8be2075d45026a9878d7a70;hb=8ea466bbb98296967cf146d295fe03c812b119da;hp=f114e915525e61696614375921e190d07ae93712;hpb=e0416f8532436f9570db3f72be075475d2e99c76;p=swftools.git

diff --git a/lib/png.c b/lib/png.c
index f114e91..49c3c3d 100644
--- a/lib/png.c
+++ b/lib/png.c
@@ -545,8 +545,9 @@ int getPNG(char*sname, int*destwidth, int*destheight, unsigned char**destdata)
 	    }
 	    printf("\n");*/
 	}
-	if(data)
-	    free(data);
+	if(data) {
+	    free(data); data=0;
+        }
     }
     
     if(!zimagedata || uncompress(imagedata, &imagedatalen, zimagedata, zimagedatalen) != Z_OK) {
@@ -602,6 +603,7 @@ int getPNG(char*sname, int*destwidth, int*destheight, unsigned char**destdata)
 	    }
 	}
 	free(old);
+        free(imagedata);
     } else if(header.mode == 6 || header.mode == 2) {
 	int i,s=0;
 	int x,y;
@@ -632,11 +634,24 @@ int getPNG(char*sname, int*destwidth, int*destheight, unsigned char**destdata)
 	    } else {
 		old = &data2[(y-1)*header.width*4];
 	    }
-	    if(header.mode == 6)
+	    if(header.mode == 6) {
 		applyfilter4(mode, src, old, dest, header.width);
-	    else // header.mode = 2
+	    } else { // header.mode = 2
 		applyfilter3(mode, src, old, dest, header.width);
+		/* replace alpha color */
+		if(hasalphacolor) {
+		    int x;
+		    for(x=0;x<header.width;x++) {
+			if(dest[x*4+1] == alphacolor[0] &&
+			   dest[x*4+2] == alphacolor[1] &&
+			   dest[x*4+3] == alphacolor[2]) {
+			    *(U32*)&dest[x*4] = 0;
+			}
+		    }
+		}
+	    }
 	}
+        free(imagedata);
     } else if(header.mode == 0 || header.mode == 3) {
 	COL*rgba = 0;
 	U8*tmpline = (U8*)malloc(header.width+1);
@@ -726,6 +741,7 @@ int getPNG(char*sname, int*destwidth, int*destheight, unsigned char**destdata)
 	free(tmpline);
 	free(destline);
 	free(rgba);
+        free(imagedata);
     } else {
 	printf("expected PNG mode to be 2, 3 or 6 (is:%d)\n", header.mode);
 	return 0;
@@ -883,7 +899,7 @@ void writePNG(char*filename, unsigned char*data, int width, int height)
     }
 
     datalen2 = datalen3;
-    data2 = malloc(datalen2);
+    data2 = (U8*)malloc(datalen2);
 
     if((ret = compress (data2, &datalen2, data3, datalen3)) != Z_OK) {
 	fprintf(stderr, "zlib error in pic %d\n", ret);