{
char id[4];
int len;
+ int ok=0;
U8 head[8] = {137,80,78,71,13,10,26,10};
U8 head2[8];
U8*data;
fprintf(stderr, "Image mode %d not supported!\n", b);
exit(1);
}
- if(a!=8) {
- fprintf(stderr, "Bpp %d not supported!\n", a);
+ if(a!=8 && b==2) {
+ fprintf(stderr, "Bpp %d in mode %d not supported!\n", a);
exit(1);
}
if(c!=0) {
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;
int len;
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;
if(!strncmp(tagid, "PLTE", 4)) {
palette = data;
palettelen = len/3;
- data = 0;
+ 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);
+ }
+ }
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;
}
}
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);
+
+ if(alphapalette)
+ t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS2);
+ else
+ t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS);
- t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS);
swf_SetU16(t, id); // id
if(header.mode == 2) {
U8*data2 = malloc(header.width*header.height*4);
/* 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];
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);
RGBA*rgba = (RGBA*)malloc(palettelen*sizeof(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(!palette) {
rgba[i].r = palette[i*3+0];
rgba[i].g = palette[i*3+1];
rgba[i].b = palette[i*3+2];
- rgba[i].a = 255;
+ if(alphapalette && i<alphapalettelen) {
+ rgba[i].a = alphapalette[i];
+ if(alphapalette[i] == 0) {
+ /* if the color is fully transparent, it doesn't matter
+ what it's rgb values are. furthermore, all Flash
+ players up to Flash 5 can't deal with anything beyond
+ one transparent color with value (00,00,00,00). */
+ rgba[i].r = rgba[i].g = rgba[i].b = 0;
+ }
+ } else {
+ rgba[i].a = 255;
+ }
}
+
for(y=0;y<header.height;y++) {
int mode = imagedata[pos++]; //filter mode
- U8*src = &imagedata[pos];
- U8*dest = &data2[y*swf_width];
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];
old = &data2[(y-1)*swf_width];
}
applyfilter1(mode, src, old, dest, header.width);
- pos+=header.width;
}
swf_SetLosslessBitsIndexed(t, header.width, header.height, data2, rgba, palettelen);
+ free(tmpline);
free(rgba);
free(data2);
}
processargs(argc, argv);
+ if(global.nfiles<=0)
+ return 1;
+
if (VERBOSE(2))
fprintf(stderr, "Processing %i file(s)...\n", global.nfiles);