#define VERBOSE(x) (global.verbose>=x)
struct {
- int framerate;
+ float framerate;
int max_image_width;
int max_image_height;
int force_width;
int force_height;
int nfiles;
int verbose;
+ int do_cgi;
char *outfile;
} global;
char *filename;
} image[MAX_INPUT_FILES];
-TAG *MovieStart(SWF * swf, int framerate, int dx, int dy)
+TAG *MovieStart(SWF * swf, float framerate, int dx, int dy)
{
TAG *t;
RGBA rgb;
memset(swf, 0x00, sizeof(SWF));
swf->fileVersion = 5;
- swf->frameRate = (25600 / framerate);
+ swf->frameRate = (int)(256.0 * framerate);
swf->movieSize.xmax = dx * 20;
swf->movieSize.ymax = dy * 20;
int MovieFinish(SWF * swf, TAG * t, char *sname)
{
- int handle, so = fileno(stdout);
+ int f, so = fileno(stdout);
t = swf_InsertTag(t, ST_END);
if ((!isatty(so)) && (!sname))
- handle = so;
+ f = so;
else {
if (!sname)
sname = "output.swf";
- handle = open(sname, O_BINARY | O_RDWR | O_CREAT | O_TRUNC, 0666);
+ f = open(sname,O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644);
+ }
+
+ if(global.do_cgi) {
+ if FAILED(swf_WriteCGI(swf)) fprintf(stderr,"WriteCGI() failed.\n");
+ } else {
+ if FAILED(swf_WriteSWF(f,swf)) fprintf(stderr,"WriteSWF() failed.\n");
+ if (f != so)
+ close(f);
}
- if FAILED
- (swf_WriteSWF(handle, swf)) if (VERBOSE(1))
- fprintf(stderr, "Unable to write output file: %s\n", sname);
- if (handle != so)
- close(handle);
swf_FreeTags(swf);
return 0;
c = data[10]; // compression mode (0)
f = data[11]; // filter mode (0)
i = data[12]; // interlace mode (0)
+
+ if(VERBOSE(2)) printf("image mode:%d\n", b);
+ if(VERBOSE(2)) printf("bpp: %d\n", a);
+ if(VERBOSE(2)) printf("compression: %d\n", c);
+ if(VERBOSE(2)) printf("filter: %d\n", f);
+ if(VERBOSE(2)) printf("interlace: %d\n", i);
- if(b!=2 && b!=3 && b!=6) {
+ if(b!=0 && b!=2 && b!=3 && b!=6) {
fprintf(stderr, "Image mode %d not supported!\n", b);
+ if(b == 4) {
+ fprintf(stderr, "(This is a grayscale image with alpha channel-\n");
+ fprintf(stderr, " try converting it into an RGB image with alpha channel)\n");
+ }
exit(1);
}
if(a!=8 && (b==2 || b==6)) {
dest[1] = src[0]+(old[1]+lastr)/2;
dest[2] = src[1]+(old[2]+lastg)/2;
dest[3] = src[2]+(old[3]+lastb)/2;
+ lasta = dest[0];
lastr = dest[1];
lastg = dest[2];
lastb = dest[3];
if(!png_read_header(fi, &header))
return 0;
- if(header.mode == 3) bypp = 1;
+ if(header.mode == 3 || header.mode == 0) bypp = 1;
else
if(header.mode == 2) bypp = 3;
else
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 */
for(y=0;y<header.height;y++) {
int mode = imagedata[pos++]; //filter mode
}
if(header.mode==6)
applyfilter4(mode, src, old, dest, header.width);
- else
+ else if(header.mode==2)
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 */
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++;
+ else if(l[x*4+0]==0) opaque++;
+ else semitransparent++;
}
}
/* 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");
+ && opaque != header.width*header.height)
+#ifndef HAVE_JPEGLIB
+ fprintf(stderr, "Warning: No jpeg lib compiled in- not able to store transparency information\n");
+#else
+ {
+ fprintf(stderr, "Image has transparency information. Storing as DefineBitsJpeg3 Tag (jpeg+alpha)\n");
+ if(VERBOSE(2))
+ printf("Image is semi-transparent\n");
// we always use quality 100, since png2swf is expected to
// use more or less lossless compression
swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
}
free(data2);
- }
- else {
- RGBA*rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
+ } 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(!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];
- 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;
+ 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];
+ 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;
}
- } else {
- rgba[i].a = 255;
+ }
+ } else {
+ palettelen = 256;
+ rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
+ for(i=0;i<256;i++) {
+ rgba[i].r = i;
+ rgba[i].g = i;
+ rgba[i].b = i;
}
}
free(data2);
}
+ while(t->len < 64) {
+ swf_SetU8(t, 0); //fix for flash player bug- see ../lib/modules/swfbits.c
+ }
+
t = swf_InsertTag(t, ST_DEFINESHAPE3);
swf_ShapeNew(&s);
switch (arg[0]) {
case 'r':
if (val)
- global.framerate = atoi(val);
- if ((global.framerate < 1) ||(global.framerate > 5000)) {
+ global.framerate = atof(val);
+ if ((global.framerate < 1.0/256) ||(global.framerate >= 256.0)) {
if (VERBOSE(1))
fprintf(stderr,
- "Error: You must specify a valid framerate between 1 and 10000.\n");
+ "Error: You must specify a valid framerate between 1/256 and 255.\n");
exit(1);
}
res = 1;
res = 1;
break;
+ case 'C':
+ global.do_cgi = 1;
+ break;
+
case 'v':
if (val)
global.verbose = atoi(val);
return res;
}
-struct options_t options[] =
-{
-{"o", "output"},
+static struct options_t options[] = {
{"r", "rate"},
+{"o", "output"},
+{"X", "pixel"},
+{"Y", "pixel"},
{"v", "verbose"},
-{"X", "width"},
-{"Y", "height"},
+{"C", "cgi"},
{"V", "version"},
+{0,0}
};
int args_callback_longoption(char *name, char *val)
void args_callback_usage(char *name)
{
- printf("Usage: %s [-options [value]] imagefiles[.png] [...]\n", name);
- printf("-r framerate (rate) Set movie framerate (100/sec)\n");
- printf("-o outputfile (output) Set name for SWF output file\n");
- printf("-X pixel (width) Force movie width to pixel (default: autodetect)\n");
- printf("-Y pixel (height) Force movie height to pixel (default: autodetect)\n");
- printf("-v level (verbose) Set verbose level (0=quiet, 1=default, 2=debug)\n");
- printf("-V (version) Print version information and exit\n");
+ printf("\n");
+ printf("Usage: %s [-X width] [-Y height] [-o file.swf] [-r rate] file1.png [file2.png...]\n", name);
+ 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("-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("-C , --cgi For use as CGI- prepend http header, write to stdout\n");
+ printf("-V , --version Print version information and exit\n");
+ printf("\n");
}
-
int main(int argc, char **argv)
{
SWF swf;
memset(&global, 0x00, sizeof(global));
- global.framerate = 100;
+ global.framerate = 1.0;
global.verbose = 1;
processargs(argc, argv);