memset(swf, 0x00, sizeof(SWF));
- swf->fileVersion = 4;
+ swf->fileVersion = 5;
swf->frameRate = (25600 / framerate);
swf->movieSize.xmax = dx * 20;
swf->movieSize.ymax = dy * 20;
t = swf->firstTag = swf_InsertTag(NULL, ST_SETBACKGROUNDCOLOR);
rgb.r = rgb.g = rgb.b = rgb.a = 0x00;
+ rgb.g = 0xff;
swf_SetRGB(t, &rgb);
return t;
else {
if (!sname)
sname = "output.swf";
- handle = open(sname, O_RDWR | O_CREAT | O_TRUNC, 0666);
+ handle = open(sname, O_BINARY | O_RDWR | O_CREAT | O_TRUNC, 0666);
}
if FAILED
(swf_WriteSWF(handle, swf)) if (VERBOSE(1))
{
char id[4];
int len;
+ int ok=0;
U8 head[8] = {137,80,78,71,13,10,26,10};
U8 head2[8];
U8*data;
f = data[11]; // filter mode (0)
i = data[12]; // interlace mode (0)
- if(b!=2 && b!=3) {
+ if(b!=2 && b!=3 && b!=6) {
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 || b==6)) {
+ 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;
else return c;
}
-void applyfilter(int mode, U8*src, U8*old, U8*dest, int width)
+void applyfilter3(int mode, U8*src, U8*old, U8*dest, int width)
{
int x;
unsigned char lastr=0;
}
+void applyfilter4(int mode, U8*src, U8*old, U8*dest, int width)
+{
+ int x;
+ unsigned char lastr=0;
+ unsigned char lastg=0;
+ unsigned char lastb=0;
+ unsigned char lasta=0;
+ unsigned char upperlastr=0;
+ unsigned char upperlastg=0;
+ unsigned char upperlastb=0;
+ unsigned char upperlasta=0;
+
+ if(mode==0) {
+ for(x=0;x<width;x++) {
+ dest[0] = src[3];
+ dest[1] = src[0];
+ dest[2] = src[1];
+ dest[3] = src[2];
+ dest+=4;
+ src+=4;
+ }
+ }
+ else if(mode==1) {
+ for(x=0;x<width;x++) {
+ dest[0] = src[3]+lasta;
+ dest[1] = src[0]+lastr;
+ dest[2] = src[1]+lastg;
+ dest[3] = src[2]+lastb;
+ lasta = dest[0];
+ lastr = dest[1];
+ lastg = dest[2];
+ lastb = dest[3];
+ dest+=4;
+ src+=4;
+ }
+ }
+ else if(mode==2) {
+ for(x=0;x<width;x++) {
+ dest[0] = src[3]+old[0];
+ dest[1] = src[0]+old[1];
+ dest[2] = src[1]+old[2];
+ dest[3] = src[2]+old[3];
+ dest+=4;
+ old+=4;
+ src+=4;
+ }
+ }
+ else if(mode==3) {
+ for(x=0;x<width;x++) {
+ dest[0] = src[3]+(old[0]+lasta)/2;
+ dest[1] = src[0]+(old[1]+lastr)/2;
+ dest[2] = src[1]+(old[2]+lastg)/2;
+ dest[3] = src[2]+(old[3]+lastb)/2;
+ lastr = dest[1];
+ lastg = dest[2];
+ lastb = dest[3];
+ dest+=4;
+ old+=4;
+ src+=4;
+ }
+ }
+ else if(mode==4) {
+ for(x=0;x<width;x++) {
+ dest[0] = src[3]+PaethPredictor(lasta,old[0],upperlasta);
+ dest[1] = src[0]+PaethPredictor(lastr,old[1],upperlastr);
+ dest[2] = src[1]+PaethPredictor(lastg,old[2],upperlastg);
+ dest[3] = src[2]+PaethPredictor(lastb,old[3],upperlastb);
+ lasta = dest[0];
+ lastr = dest[1];
+ lastg = dest[2];
+ lastb = dest[3];
+ upperlastr = old[0];
+ upperlastr = old[1];
+ upperlastg = old[2];
+ upperlastb = old[3];
+ dest+=4;
+ old+=4;
+ src+=4;
+ }
+ }
+
+}
+
void applyfilter1(int mode, U8*src, U8*old, U8*dest, int width)
{
int x;
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;
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);
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) {
+ 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;
- /* 24->32 bit conversion */
+ int opaque=0;
+ int transparent=0;
+ /* in case for mode 2, the following also performs 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*(header.mode==6?4:3);
+ } else {
+ /* not implemented yet */
+ exit(1);
+ }
+
if(!y) {
memset(data2,0,header.width*4);
old = &data2[y*header.width*4];
} else {
old = &data2[(y-1)*header.width*4];
}
- applyfilter(mode, src, old, dest, header.width);
- pos+=header.width*3;
+ if(header.mode==6)
+ applyfilter4(mode, src, old, dest, header.width);
+ else
+ applyfilter3(mode, src, old, dest, header.width);
+ }
+
+#ifdef HAVE_LIBJPEG
+ /* the image is now compressed and stored in data. Now let's take
+ a look at the alpha values to determine which bitmap type we
+ should write */
+ 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++) {
+ if(l[x*4+0]==255) transparent++;
+ if(l[x*4+0]==0) opaque++;
+ }
+ }
+ /* mode 6 images which are not fully opaque or fully transparent
+ will be stored as definejpeg3 */
+ if(header.mode == 6 && transparent != header.width*header.height
+ && opaque != header.width*header.height) {
+
+ printf("Image has transparency information. Storing as DefineBitsJpeg3 Tag (jpeg+alpha)\n");
+
+ // we always use quality 100, since png2swf is expected to
+ // use more or less lossless compression
+
+ swf_SetJPEGBits3(t, header.width, header.height, (RGBA*)data2, 100);
+ t->id = ST_DEFINEBITSJPEG3;
+ }
+ else
+#endif
+ {
+ swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
}
- swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
free(data2);
}
else {
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);
}
- t = swf_InsertTag(t, ST_DEFINESHAPE);
+ t = swf_InsertTag(t, ST_DEFINESHAPE3);
swf_ShapeNew(&s);
swf_GetMatrix(NULL, &m);
swf_ShapeSetEnd(t);
t = swf_InsertTag(t, ST_REMOVEOBJECT2);
- swf_SetU16(t, 1); // depth
+ swf_SetU16(t, 50); // depth
t = swf_InsertTag(t, ST_PLACEOBJECT2);
swf_GetMatrix(NULL, &m);
m.tx = (swf->movieSize.xmax - (int) header.width * 20) / 2;
m.ty = (swf->movieSize.ymax - (int) header.height * 20) / 2;
- swf_ObjectPlace(t, id + 1, 1, &m, NULL, NULL);
+ swf_ObjectPlace(t, id + 1, 50, &m, NULL, NULL);
t = swf_InsertTag(t, ST_SHOWFRAME);
processargs(argc, argv);
+ if(global.nfiles<=0)
+ return 1;
+
if (VERBOSE(2))
fprintf(stderr, "Processing %i file(s)...\n", global.nfiles);
git.asbjorn.biz / swftools.git / blobdiff