#include <zlib.h>
#include "../lib/rfxswf.h"
#include "../lib/args.h"
+#include "../lib/png.h"
#define MAX_INPUT_FILES 1024
#define VERBOSE(x) (global.verbose>=x)
int do_cgi;
int version;
char *outfile;
+ int mkjpeg;
float scale;
} global;
t = swf->firstTag = swf_InsertTag(NULL, ST_SETBACKGROUNDCOLOR);
rgb.r = rgb.g = rgb.b = rgb.a = 0x00;
- rgb.g = 0xff; //<--- handy for testing alpha conversion
+ //rgb.g = 0xff; //<--- handy for testing alpha conversion
swf_SetRGB(t, &rgb);
return t;
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);
}
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)
{
unsigned int a;
fread(&a,4,1,fi);
- return REVERSESWAP32(a);
+ return BE_32_TO_NATIVE(a);
}
struct png_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))
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) or 2(rgb)
+ b = data[9]; // should be 3(indexed), 2(rgb), 0(grayscale) or 6(truecolor+alpha)
c = data[10]; // compression mode (0)
f = data[11]; // filter mode (0)
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) {
src+=3;
}
}
-
}
void applyfilter4(int mode, U8*src, U8*old, U8*dest, int width)
}
-TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
+TAG* PNG2Image(TAG*t, U16 id, char*filename, int*width, int*height)
{
- SHAPE *s;
- SRECT r;
- MATRIX m;
- int fs;
-
char tagid[4];
- int len;
U8*data;
U8*imagedata;
U8*zimagedata=0;
int bypp;
U8 alphacolor[3];
int hasalphacolor=0;
+ int len;
+
FILE *fi;
U8 *scanline;
- if ((fi = fopen(sname, "rb")) == NULL) {
+ if ((fi = fopen(filename, "rb")) == NULL) {
if (VERBOSE(1))
- fprintf(stderr, "Read access failed: %s\n", sname);
+ 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;
}
if(!strncmp(tagid, "PLTE", 4)) {
palette = data;
- palettelen = len/bypp;
+ palettelen = len/3;
data = 0; //don't free data
if(VERBOSE(2))
printf("%d colors in palette\n", palettelen);
data = 0; //don't free data
if(VERBOSE(2))
printf("found %d alpha colors\n", alphapalettelen);
- } else if(header.mode == 0) {
+ } else if(header.mode == 0 || header.mode == 2) {
int t;
- if(header.mode == 3) { // palette or grayscale?
+ if(header.mode == 2) { // palette or grayscale?
alphacolor[0] = data[1];
alphacolor[1] = data[3];
alphacolor[2] = data[5];
}
if(!zimagedata || uncompress(imagedata, &imagedatalen, zimagedata, zimagedatalen) != Z_OK) {
- fprintf(stderr, "Couldn't uncompress %s!\n", sname);
+ fprintf(stderr, "Couldn't uncompress IDAT chunk (%lu bytes) in %s!\n", imagedatalen, filename);
if(zimagedata)
free(zimagedata);
return 0;
} else {
old = &data2[(y-1)*header.width*4];
}
- if(header.mode==6)
+ if(header.mode==6) {
applyfilter4(mode, src, old, dest, header.width);
- else if(header.mode==2)
+ } 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);
if(hasalphacolor) {
if(rgba[i].r == alphacolor[0] &&
rgba[i].g == alphacolor[1] &&
- rgba[i].b == alphacolor[2])
+ rgba[i].b == alphacolor[2]) {
+ rgba[i].r = 0;
+ rgba[i].g = 0;
+ rgba[i].b = 0;
rgba[i].a = 0;
+ }
}
}
} else {
rgba[i].b = i*mult;
rgba[i].a = 255;
if(hasalphacolor) {
- if(rgba[i].r == alphacolor[0])
+ if(rgba[i].r == alphacolor[0]) {
+ rgba[i].r = 0;
+ rgba[i].g = 0;
+ rgba[i].b = 0;
rgba[i].a = 0;
+ }
}
}
}
free(rgba);
free(data2);
}
+ fclose(fi);
+ return t;
+}
+
+TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
+{
+ SHAPE *s;
+ SRECT r;
+ MATRIX m;
+ int fs;
+
+ int 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);
+ if(!data)
+ exit(1);
+ if(swf_ImageHasAlpha(data, width, height)) {
+ t = swf_InsertTag(t, ST_DEFINEBITSJPEG3);
+ swf_SetU16(t, id);
+ swf_SetJPEGBits3(t, width,height,data,global.mkjpeg);
+ } else {
+ t = swf_InsertTag(t, ST_DEFINEBITSJPEG2);
+ swf_SetU16(t, id);
+ swf_SetJPEGBits2(t, width,height,data,global.mkjpeg);
+ }
+#endif
+ } else if(1) {
+ RGBA*data = 0;
+ getPNG(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);
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
r.xmin = r.ymin = 0;
- r.xmax = header.width * 20;
- r.ymax = header.height * 20;
+ r.xmax = width * 20;
+ r.ymax = height * 20;
swf_SetRect(t, &r);
swf_SetShapeHeader(t, s);
m.tx = move_x*20;
m.ty = move_y*20;
} else {
- m.tx = (swf->movieSize.xmax - (int) (header.width * global.scale * 20)) / 2;
- m.ty = (swf->movieSize.ymax - (int) (header.height * global.scale * 20)) / 2;
+ m.tx = (swf->movieSize.xmax - (int) (width * global.scale * 20)) / 2;
+ m.ty = (swf->movieSize.ymax - (int) (height * global.scale * 20)) / 2;
}
swf_ObjectPlace(t, id + 1, 50, &m, NULL, NULL);
t = swf_InsertTag(t, ST_SHOWFRAME);
- fclose(fi);
-
return t;
}
break;
case 'z':
- global.version = 6;
+ if(global.version<6)
+ global.version = 6;
res = 0;
break;
+ case 'j':
+ global.mkjpeg = atoi(val);
+ res = 1;
+ break;
+
case 'T':
global.version = atoi(val);
res = 1;
global.force_height = atoi(val);
res = 1;
break;
-
+
case 'V':
printf("png2swf - part of %s %s\n", PACKAGE, VERSION);
exit(0);
static struct options_t options[] = {
{"r", "rate"},
{"o", "output"},
+{"j", "jpeg"},
{"z", "zlib"},
+{"T", "flashversion"},
{"X", "pixel"},
{"Y", "pixel"},
{"v", "verbose"},
printf("\n");
printf("-r , --rate <framerate> Set movie framerate (frames per second)\n");
printf("-o , --output <filename> Set name for SWF output file.\n");
+ printf("-j , --jpeg <quality> Generate a lossy jpeg bitmap inside the SWF, with a given quality (1-100)\n");
printf("-z , --zlib <zlib> Enable Flash 6 (MX) Zlib Compression\n");
+ printf("-T , --flashversion Set the flash version to generate\n");
printf("-X , --pixel <width> Force movie width to <width> (default: autodetect)\n");
printf("-Y , --pixel <height> Force movie height to <height> (default: autodetect)\n");
printf("-v , --verbose <level> Set verbose level (0=quiet, 1=default, 2=debug)\n");
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");
}
global.framerate = 1.0;
global.verbose = 1;
- global.version = 4;
+ global.version = 8;
global.scale = 1.0;
processargs(argc, argv);
git.asbjorn.biz / swftools.git / blobdiff