X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fpng2swf.c;h=a6782f7b5005a59604c67e9d4bcb5b29cde761a2;hp=5da1945d083ea7b367d8cb033023f375827f0ad5;hb=661e19e521cd9544e83c50df23f29c645d5d26fe;hpb=5b0f171d461fac3d379022d195cafe1992243466

diff --git a/src/png2swf.c b/src/png2swf.c
index 5da1945..a6782f7 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -100,13 +100,8 @@ int MovieFinish(SWF * swf, TAG * t, char *sname)
     if(global.do_cgi) {
 	if FAILED(swf_WriteCGI(swf)) fprintf(stderr,"WriteCGI() failed.\n");
     } else {
-	if(global.version >= 6) {
-	    if (swf_WriteSWC(f, swf)<0) 
-		    fprintf(stderr, "Unable to write output file: %s\n", sname);
-	} else {
-	    if (swf_WriteSWF(f, swf)<0) 
-		    fprintf(stderr, "Unable to write output file: %s\n", sname);
-	}
+        if (swf_WriteSWF(f, swf)<0) 
+            fprintf(stderr, "Unable to write output file: %s\n", sname);
 	if (f != so)
 	    close(f);
     }
@@ -124,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)
@@ -148,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
@@ -168,7 +163,7 @@ int png_read_header(FILE*fi, struct png_header*header)
     U8 head2[8];
     U8*data;
     fread(head2,8,1,fi);
-    if(strncmp(head,head2,4))
+    if(strncmp((char*)head,(char*)head2,4))
 	return 0;
    
     while(png_read_chunk(&id, &len, &data, fi))
@@ -178,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)
 
@@ -202,7 +197,7 @@ int png_read_header(FILE*fi, struct png_header*header)
 		exit(1);
 	    }
 	    if(a!=8 && (b==2 || b==6)) {
-		fprintf(stderr, "Bpp %d in mode %d not supported!\n", a);
+		fprintf(stderr, "Bpp %d in mode %d not supported!\n", b, a);
 		exit(1);
 	    }
 	    if(c!=0) {
@@ -459,294 +454,6 @@ void applyfilter1(int mode, U8*src, U8*old, U8*dest, int width)
 
 }
 
-TAG* PNG2Image(TAG*t, U16 id, char*filename, int*width, int*height)
-{
-    char tagid[4];
-    U8*data;
-    U8*imagedata;
-    U8*zimagedata=0;
-    unsigned long int imagedatalen;
-    unsigned long int zimagedatalen=0;
-    U8*palette = 0;
-    int palettelen = 0;
-    U8*alphapalette = 0;
-    int alphapalettelen = 0;
-    struct png_header header;
-    int bypp;
-    U8 alphacolor[3];
-    int hasalphacolor=0;
-    int len;
-
-
-    FILE *fi;
-    U8 *scanline;
-
-    if ((fi = fopen(filename, "rb")) == NULL) {
-	if (VERBOSE(1))
-	    fprintf(stderr, "Read access failed: %s\n", filename);
-	return t;
-    }
-
-    if(!png_read_header(fi, &header))
-	return 0;
-
-    *width = header.width;
-    *height = header.height;
-
-    if(header.mode == 3 || header.mode == 0) bypp = 1;
-    else
-    if(header.mode == 2) bypp = 3;
-    else
-    if(header.mode == 6) bypp = 4;
-    else
-	return 0;
-    imagedatalen = bypp * header.width * header.height + 65536;
-    imagedata = malloc(imagedatalen);
-
-    fseek(fi,8,SEEK_SET);
-    while(!feof(fi))
-    {
-	if(!png_read_chunk(&tagid, &len, &data, fi))
-	    break;
-	if(!strncmp(tagid, "IEND", 4)) {
-	    break;
-	}
-	if(!strncmp(tagid, "PLTE", 4)) {
-	    palette = data;
-	    palettelen = len/3;
-	    data = 0; //don't free data
-	    if(VERBOSE(2))
-		printf("%d colors in palette\n", palettelen);
-	}
-	if(!strncmp(tagid, "tRNS", 4)) {
-	    if(header.mode == 3) {
-		alphapalette = data;
-		alphapalettelen = len;
-		data = 0; //don't free data
-		if(VERBOSE(2))
-		    printf("found %d alpha colors\n", alphapalettelen);
-	    } else if(header.mode == 0 || header.mode == 2) {
-		int t;
-		if(header.mode == 2) { // palette or grayscale?
-		    alphacolor[0] = data[1];
-		    alphacolor[1] = data[3];
-		    alphacolor[2] = data[5];
-		} else {
-		    alphacolor[0] = alphacolor[1] = alphacolor[2] = data[1];
-		}
-		if(VERBOSE(2))
-		    printf("found alpha color: %02x%02x%02x\n", alphacolor[0], alphacolor[1], alphacolor[2]);
-		hasalphacolor = 1;
-	    } else {
-		if(VERBOSE(2))
-		    printf("ignoring tRNS %d entry (%d bytes)\n", header.mode, len);
-	    }
-	}
-	if(!strncmp(tagid, "IDAT", 4)) {
-	    if(!zimagedata) {
-		zimagedatalen = len;
-		zimagedata = malloc(len);
-		memcpy(zimagedata,data,len);
-	    } else {
-		zimagedata = realloc(zimagedata, zimagedatalen+len);
-		memcpy(&zimagedata[zimagedatalen], data, len);
-		zimagedatalen += len;
-	    }
-	}
-	if(data)
-	    free(data);
-    }
-    
-    if(!zimagedata || uncompress(imagedata, &imagedatalen, zimagedata, zimagedatalen) != Z_OK) {
-	fprintf(stderr, "Couldn't uncompress IDAT chunk (%d bytes) in %s!\n", imagedatalen, filename);
-	if(zimagedata)
-	    free(zimagedata);
-	return 0;
-    }
-    free(zimagedata);
-
-    if(alphapalette || hasalphacolor)
-	t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS2);
-    else
-	t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS);
-
-    swf_SetU16(t, id);		// id
-    if(header.mode == 2 || header.mode == 6) {
-	U8*data2 = malloc(header.width*header.height*4);
-	int i,s=0;
-	int x,y;
-	int pos=0;
-	int opaque=0;
-	int transparent=0;
-	int semitransparent=0;
-	/* in case for mode 2, the following also performs 24->32 bit conversion */
-	unsigned char* firstline = malloc(header.width*4);
-
-	for(y=0;y<header.height;y++) {
-	    int mode = imagedata[pos++]; //filter mode
-	    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*(header.mode==6?4:3);
-	    } else {
-		/* not implemented yet */
-		exit(1);
-	    }
-
-	    if(!y) {
-		old = firstline;
-		memset(old, 0, header.width*4); //TODO: fill alpha with 255?
-	    } else {
-		old = &data2[(y-1)*header.width*4];
-	    }
-	    if(header.mode==6) {
-		applyfilter4(mode, src, old, dest, header.width);
-	    } else if(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(firstline);
-
-	/* the image is now compressed and stored in data. Now let's take
-	   a look at the alpha values */
-	if(header.mode == 6) {
-	    for(y=0;y<header.height;y++) {
-		U8*l = &data2[(y*header.width)*4];
-		for(x=0;x<header.width;x++) {
-		    U8 a = l[x*4];
-		    U8 b = l[x*4+1];
-		    U8 g = l[x*4+2];
-		    U8 r = l[x*4+3];
-		    if(a==255) transparent++;
-		    else {
-			if(a==0) opaque++;
-			else semitransparent++;
-			l[x*4+3]=(int)r*a/255;
-			l[x*4+2]=(int)g*a/255;
-			l[x*4+1]=(int)b*a/255;
-		    }
-		}
-	    }
-	    if(semitransparent || opaque) {
-		t->id = ST_DEFINEBITSLOSSLESS2;
-	    }
-	}
-	swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
-	free(data2);
-    } else if(header.mode == 0 || header.mode == 3) {
-	RGBA*rgba;
-	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(header.mode == 3) { // palette or grayscale?
-	    rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
-	    if(!palette) {
-		fprintf(stderr, "Error: No palette found!\n");
-		exit(1);
-	    }
-	    /* 24->32 bit conversion */
-	    for(i=0;i<palettelen;i++) {
-		rgba[i].r = palette[i*3+0];
-		rgba[i].g = palette[i*3+1];
-		rgba[i].b = palette[i*3+2];
-		if(alphapalette && i<alphapalettelen) {
-		    rgba[i].a = alphapalette[i];
-		    rgba[i].r = ((int)rgba[i].r*rgba[i].a)/255;
-		    rgba[i].g = ((int)rgba[i].g*rgba[i].a)/255;
-		    rgba[i].b = ((int)rgba[i].b*rgba[i].a)/255;
-		} else {
-		    rgba[i].a = 255;
-		}
-		if(hasalphacolor) {
-		    if(rgba[i].r == alphacolor[0] &&
-		       rgba[i].g == alphacolor[1] &&
-		       rgba[i].b == alphacolor[2]) {
-			rgba[i].r = 0;
-			rgba[i].g = 0;
-			rgba[i].b = 0;
-			rgba[i].a = 0;
-		    }
-		}
-	    }
-	} else {
-            int mult = (0x1ff>>header.bpp);
-	    palettelen = 1<<header.bpp;
-	    rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
-	    for(i=0;i<palettelen;i++) {
-		rgba[i].r = i*mult;
-		rgba[i].g = i*mult;
-		rgba[i].b = i*mult;
-		rgba[i].a = 255;
-		if(hasalphacolor) {
-		    if(rgba[i].r == alphacolor[0]) {
-			rgba[i].r = 0;
-			rgba[i].g = 0;
-			rgba[i].b = 0;
-			rgba[i].a = 0;
-		    }
-		}
-	    }
-	}
-
-	for(y=0;y<header.height;y++) {
-	    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;
-	    }
-
-	    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);
-    }
-    fclose(fi);
-    return t;
-}
-
 TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 {
     SHAPE *s;
@@ -754,11 +461,18 @@ 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) {
+        global.mkjpeg = 0;
+        msg("<warning> No jpeg support compiled in");
+    }
+#endif
+    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)) {
@@ -770,17 +484,15 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	    swf_SetU16(t, id);
 	    swf_SetJPEGBits2(t, width,height,data,global.mkjpeg);
 	}
-    } else if(1) {
+#endif
+    } else {
 	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);
 	swf_SetU16(t, id);
 	swf_SetLosslessImage(t, data,width,height);
-    } else {
-	/* old code: transform PNG encoding 1:1 to SWF */
-	t = PNG2Image(t, id, sname, &width, &height);
     }
 
     t = swf_InsertTag(t, ST_DEFINESHAPE3);
@@ -789,8 +501,8 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     swf_GetMatrix(NULL, &m);
     m.sx = (int)(20 * 0x10000);
     m.sy = (int)(20 * 0x10000);
-    m.tx = -10;
-    m.ty = -10;
+    m.tx = 0;
+    m.ty = 0;
     fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 1);
 
     swf_SetU16(t, id + 1);	// id
@@ -1064,7 +776,7 @@ void args_callback_usage(char *name)
     printf("-q , --quiet                   Omit normal log messages, only log errors\n");
     printf("-C , --cgi                     For use as CGI- prepend http header, write to stdout\n");
     printf("-V , --version                 Print version information and exit\n");
-    printf("-s , --scale <percent>         Scale image to <percent>% size.\n");
+    printf("-s , --scale <percent>         Scale image to <percent>%% size.\n");
     printf("\n");
 }
 
@@ -1077,7 +789,7 @@ int main(int argc, char **argv)
 
     global.framerate = 1.0;
     global.verbose = 1;
-    global.version = 6;
+    global.version = 8;
     global.scale = 1.0;
 
     processargs(argc, argv);