X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=8a10871fa148232311b6abda8d125fcd6459285a;hb=44b68a533fc2933019e58c1998cf644eb2651c3c;hp=0e584e38fcf50377797eed57bb6587e014e31be5;hpb=1204eaea945b78ca2a8c8b8941365610881f69cf;p=swftools.git

diff --git a/src/png2swf.c b/src/png2swf.c
index 0e584e3..8a10871 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -87,7 +87,6 @@ int png_read_chunk(char (*head)[4], int*destlen, U8**destdata, FILE*fi)
     if(!fread(head, 4, 1, fi))
 	return 0;
     len = REVERSESWAP32(len);
-    printf("id: %.4s len: %d\n", head, len);
     if(destlen) *destlen = len;
     if(destdata) {
 	if(len)
@@ -126,6 +125,7 @@ int png_read_header(FILE*fi, struct png_header*header)
 {
     char id[4];
     int len;
+    int ok=0;
     U8 head[8] = {137,80,78,71,13,10,26,10};
     U8 head2[8];
     U8*data;
@@ -135,7 +135,8 @@ int png_read_header(FILE*fi, struct png_header*header)
    
     while(png_read_chunk(&id, &len, &data, fi))
     {
-	printf("%c%c%c%c %d\n", id[0],id[1],id[2],id[3],len);
+	if(VERBOSE(2))
+	    printf("%c%c%c%c %d\n", id[0],id[1],id[2],id[3],len);
 	if(!strncasecmp(id, "IHDR", 4)) {
 	    char a,b,c,f,i;
 	    if(len < 8) exit(1);
@@ -147,6 +148,15 @@ int png_read_header(FILE*fi, struct png_header*header)
 	    c = data[10];     // compression mode (0)
 	    f = data[11];     // filter mode (0)
 	    i = data[12];     // interlace mode (0)
+
+	    if(b!=2 && b!=3) {
+		fprintf(stderr, "Image mode %d not supported!\n", b);
+		exit(1);
+	    }
+	    if(a!=8 && b==2) {
+		fprintf(stderr, "Bpp %d in mode %d not supported!\n", a);
+		exit(1);
+	    }
 	    if(c!=0) {
 		fprintf(stderr, "Compression mode %d not supported!\n", c);
 		exit(1);
@@ -159,16 +169,16 @@ int png_read_header(FILE*fi, struct png_header*header)
 		fprintf(stderr, "Interlace mode %d not supported!\n", i);
 		exit(1);
 	    }
-	    printf("%dx%d %d %d %d %d %d\n",header->width, header->height, a,b,c,f,i);
+	    if(VERBOSE(2))
+		printf("%dx%d %d %d %d %d %d\n",header->width, header->height, a,b,c,f,i);
 	    header->bpp = a;
 	    header->mode = b;
-	    return 1;
-	} else {
-	    fseek(fi, len, SEEK_CUR);
-	}
+	    ok = 1;
+	} 
+	
 	free(data);
     }
-    return 0;
+    return ok;
 }
 
 typedef unsigned char byte;
@@ -267,6 +277,56 @@ void applyfilter(int mode, U8*src, U8*old, U8*dest, int width)
 
 }
 
+void applyfilter1(int mode, U8*src, U8*old, U8*dest, int width)
+{
+    int x;
+    unsigned char last=0;
+    unsigned char upperlast=0;
+
+    if(mode==0) {
+	for(x=0;x<width;x++) {
+	    *dest = *src;
+	    dest++;
+	    src++;
+	}
+    }
+    else if(mode==1) {
+	for(x=0;x<width;x++) {
+	    *dest = *src+last;
+	    last = *dest;
+	    dest++;
+	    src++;
+	}
+    }
+    else if(mode==2) {
+	for(x=0;x<width;x++) {
+	    *dest = *src+*old;
+	    dest++;
+	    old++;
+	    src++;
+	}
+    }
+    else if(mode==3) {
+	for(x=0;x<width;x++) {
+	    *dest = *src+(*old+last)/2;
+	    dest++;
+	    old++;
+	    src++;
+	}
+    }
+    else if(mode==4) {
+	for(x=0;x<width;x++) {
+	    *dest = *src+PaethPredictor(last,*old,upperlast);
+	    last = *dest;
+	    upperlast = *old;
+	    dest++;
+	    old++;
+	    src++;
+	}
+    }    
+
+}
+
 TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 {
     SHAPE *s;
@@ -278,7 +338,9 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     int len;
     U8*data;
     U8*imagedata;
+    U8*zimagedata=0;
     unsigned long int imagedatalen;
+    unsigned long int zimagedatalen=0;
     U8*palette = 0;
     int palettelen = 0;
     struct png_header header;
@@ -316,18 +378,31 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	    palette = data;
 	    palettelen = len/3;
 	    data = 0;
-	    printf("%d palette\n", len);
+	    if(VERBOSE(2))
+		printf("%d colors in palette\n", palettelen);
 	}
 	if(!strncmp(tagid, "IDAT", 4)) {
-	    if(uncompress(imagedata, &imagedatalen, data, len) != Z_OK) {
-		fprintf(stderr, "Couldn't uncompress %s!\n", sname);
-		return 0;
+	    if(!zimagedata) {
+		zimagedatalen = len;
+		zimagedata = malloc(len);
+		memcpy(zimagedata,data,len);
+	    } else {
+		zimagedata = realloc(zimagedata, zimagedatalen+len);
+		memcpy(&zimagedata[zimagedatalen], data, len);
+		zimagedatalen += len;
 	    }
-	    printf("IDAT %d -> %d\n", len, imagedatalen);
 	}
 	if(data)
 	    free(data);
     }
+    
+    if(!zimagedata || uncompress(imagedata, &imagedatalen, zimagedata, zimagedatalen) != Z_OK) {
+	fprintf(stderr, "Couldn't uncompress %s!\n", sname);
+	if(zimagedata)
+	    free(zimagedata);
+	return 0;
+    }
+    free(zimagedata);
 
     t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS);
     swf_SetU16(t, id);		// id
@@ -339,10 +414,21 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	/* 24->32 bit conversion */
 	for(y=0;y<header.height;y++) {
 	    int mode = imagedata[pos++]; //filter mode
-
-	    U8*src = &imagedata[pos];
-	    U8*dest = &data2[(y*header.width)*4];
+	    U8*src;
+	    U8*dest;
 	    U8*old;
+	    dest = &data2[(y*header.width)*4];
+
+	    if(header.bpp == 8)
+	    {
+		/* one byte per pixel */
+		src = &imagedata[pos];
+		pos+=header.width*3;
+	    } else {
+		/* not implemented yet */
+		exit(1);
+	    }
+
 	    if(!y) {
 		memset(data2,0,header.width*4);
 		old = &data2[y*header.width*4];
@@ -350,14 +436,15 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 		old = &data2[(y-1)*header.width*4];
 	    }
 	    applyfilter(mode, src, old, dest, header.width);
-	    pos+=header.width*3;
 	}
 	swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
 	free(data2);
     }
     else {
 	RGBA*rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
-	U8*data2 = malloc((header.width+4)*header.height);
+	int swf_width = BYTES_PER_SCANLINE(header.width);
+	U8*data2 = malloc(swf_width*header.height);
+	U8*tmpline = malloc(header.width);
 	int i,x,y;
 	int pos=0;
 	if(!palette) {
@@ -372,17 +459,38 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	    rgba[i].a = 255;
 	}
 	for(y=0;y<header.height;y++) {
-	    int mode = imagedata[pos];
-	    if(mode!=0) {
-		fprintf(stderr, "Warning: Filter mode %d\n", mode);
+	    int mode = imagedata[pos++]; //filter mode
+	    U8*old;
+	    U8*dest = &data2[y*swf_width];
+	    U8*src;
+	    src = &imagedata[pos];
+	    if(header.bpp == 8) {
+		pos+=header.width;
+	    } else {
+		int x,s=0;
+		int bitpos = 0;
+		U32 v = (1<<header.bpp)-1;
+		for(x=0;x<header.width;x++) {
+		    U32 r = src[s/8]<<8 | 
+			    src[s/8+1];
+		    int t;
+		    tmpline[x] = (r>>(16-header.bpp-(s&7)))&v;
+		    s+=header.bpp;
+		}
+		src = tmpline;
+		pos+=(header.width*header.bpp+7)/8;
 	    }
-	    pos++; //filter mode
-	    for(x=0;x<header.width;x++) {
-		data2[y*header.width+x] = 
-		    imagedata[pos++];
+
+	    if(!y) {
+		memset(data2,0,swf_width);
+		old = &data2[y*swf_width];
+	    } else {
+		old = &data2[(y-1)*swf_width];
 	    }
+	    applyfilter1(mode, src, old, dest, header.width);
 	}
 	swf_SetLosslessBitsIndexed(t, header.width, header.height, data2, rgba, palettelen);
+	free(tmpline);
 	free(rgba);
 	free(data2);
     }
@@ -460,14 +568,6 @@ int CheckInputFile(char *fname, char **realname)
 	fprintf(stderr, "%s is not a PNG file!\n", fname);
 	return -1;
     }
-    if(head.mode!=2 && head.mode!=3) {
-	fprintf(stderr, "%s has unsupported mode %d\n", head.mode);
-	return -1;
-    }
-    if(head.bpp!=8) {
-	fprintf(stderr, "%s has unsupported bpp %d\n", head.bpp);
-	return -1;
-    }
 
     if (global.max_image_width < head.width)
 	global.max_image_width = head.width;
@@ -598,6 +698,9 @@ int main(int argc, char **argv)
 
     processargs(argc, argv);
 
+    if(global.nfiles<=0)
+	return 1;
+
     if (VERBOSE(2))
 	fprintf(stderr, "Processing %i file(s)...\n", global.nfiles);