#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;
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];
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 if(header.mode == 0 || header.mode == 3) {
+ } 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);
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);
struct options_t options[] =
{
+{"h", "help"},
{"o", "output"},
{"r", "rate"},
+{"C", "cgi"},
{"v", "verbose"},
{"X", "width"},
{"Y", "height"},
{"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("\t-r , --rate <framerate>\t\t\tSet movie framerate (frames per second)\n");
+ printf("\t-o , --output <filename>\t\t\tSet name for SWF output file\n");
+ printf("\t-X , --pixel <width>\t\t\tForce movie width to pixel (default: autodetect)\n");
+ printf("\t-Y , --pixel <height>\t\t\tForce movie height to pixel (default: autodetect)\n");
+ printf("\t-v , --verbose <level>\t\t\t Set verbose level (0=quiet, 1=default, 2=debug)\n");
+ printf("\t-C , --cgi\t\t\t For use as CGI- prepend http header, write to stdout\n");
+ printf("\t-V , --version\t\t\tPrint version information and exit\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);