X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=e033e93d5437b902d1c8146f0fce50b53b4b0289;hb=18a26d55cce0b899106edb796bad0df32de8259f;hp=188bacd2301be7c545706355700c911dd979cbc3;hpb=66919a9db58644b12a7b580cb110e9988f997eec;p=swftools.git diff --git a/src/png2swf.c b/src/png2swf.c index 188bacd..e033e93 100644 --- a/src/png2swf.c +++ b/src/png2swf.c @@ -31,13 +31,14 @@ #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; @@ -45,7 +46,7 @@ struct { 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; @@ -53,7 +54,7 @@ TAG *MovieStart(SWF * swf, int framerate, int dx, int dy) 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; @@ -68,21 +69,24 @@ TAG *MovieStart(SWF * swf, int framerate, int dx, int dy) 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; @@ -168,6 +172,10 @@ int png_read_header(FILE*fi, struct png_header*header) 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)) { @@ -556,7 +564,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id) } if(header.mode==6) applyfilter4(mode, src, old, dest, header.width); - else + else if(header.mode==2) applyfilter3(mode, src, old, dest, header.width); } @@ -577,7 +585,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id) 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"); + fprintf(stderr, "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 @@ -591,8 +599,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id) 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); @@ -763,11 +770,11 @@ int args_callback_option(char *arg, char *val) 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; @@ -779,6 +786,10 @@ int args_callback_option(char *arg, char *val) res = 1; break; + case 'C': + global.do_cgi = 1; + break; + case 'v': if (val) global.verbose = atoi(val); @@ -817,12 +828,15 @@ int args_callback_option(char *arg, char *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) @@ -852,15 +866,15 @@ int args_callback_command(char *arg, char *next) // actually used as filename 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 \t\t\tSet movie framerate (frames per second)\n"); + printf("\t-o , --output \t\t\tSet name for SWF output file\n"); + printf("\t-X , --pixel \t\t\tForce movie width to pixel (default: autodetect)\n"); + printf("\t-Y , --pixel \t\t\tForce movie height to pixel (default: autodetect)\n"); + printf("\t-v , --verbose \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; @@ -868,7 +882,7 @@ int main(int argc, char **argv) memset(&global, 0x00, sizeof(global)); - global.framerate = 100; + global.framerate = 1.0; global.verbose = 1; processargs(argc, argv);