Part of the swftools package.
- Copyright (c) 2002 Matthias Kramm <kramm@quiss.org>
+ Copyright (c) 2002,2003 Matthias Kramm <kramm@quiss.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
- This file is distributed under the GPL, see file COPYING for details
-
-*/
-
#include <stdio.h>
#include <math.h>
#include <fcntl.h>
#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 prescale;
int nfiles;
int verbose;
+ int do_cgi;
char *outfile;
} global;
struct {
char *filename;
- int scale;
} 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 = 4;
- swf->frameRate = (25600 / framerate);
+ swf->fileVersion = 5;
+ swf->frameRate = (int)(256.0 * 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; <--- handy for testing alpha conversion
swf_SetRGB(t, &rgb);
return t;
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_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(!fread(head, 4, 1, fi))
return 0;
len = REVERSESWAP32(len);
- printf("id: %.4s len: %d\n", head, len);
if(destlen) *destlen = len;
if(destdata) {
if(len)
{
char id[4];
int len;
+ int ok=0;
U8 head[8] = {137,80,78,71,13,10,26,10};
U8 head2[8];
U8*data;
while(png_read_chunk(&id, &len, &data, fi))
{
- printf("%c%c%c%c %d\n", id[0],id[1],id[2],id[3],len);
+ if(VERBOSE(2))
+ printf("%c%c%c%c %d\n", id[0],id[1],id[2],id[3],len);
if(!strncasecmp(id, "IHDR", 4)) {
char a,b,c,f,i;
if(len < 8) exit(1);
c = data[10]; // compression mode (0)
f = data[11]; // filter mode (0)
i = data[12]; // interlace mode (0)
- printf("%08xx%08x %d %d %d %d %d\n",header->width, header->height, a,b,c,f,i);
+
+ 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!=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)) {
+ fprintf(stderr, "Bpp %d in mode %d not supported!\n", a);
+ exit(1);
+ }
+ if(c!=0) {
+ fprintf(stderr, "Compression mode %d not supported!\n", c);
+ exit(1);
+ }
+ if(f!=0) {
+ fprintf(stderr, "Filter mode %d not supported!\n", f);
+ exit(1);
+ }
+ if(i!=0) {
+ fprintf(stderr, "Interlace mode %d not supported!\n", i);
+ exit(1);
+ }
+ if(VERBOSE(2))
+ 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;
+#define ABS(a) ((a)>0?(a):(-(a)))
+byte inline PaethPredictor (byte a,byte b,byte c)
+{
+ // a = left, b = above, c = upper left
+ int p = a + b - c; // initial estimate
+ int pa = ABS(p - a); // distances to a, b, c
+ int pb = ABS(p - b);
+ int pc = ABS(p - c);
+ // return nearest of a,b,c,
+ // breaking ties in order a,b,c.
+ if (pa <= pb && pa <= pc)
+ return a;
+ else if (pb <= pc)
+ return b;
+ else return c;
+}
+
+void applyfilter3(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 upperlastr=0;
+ unsigned char upperlastg=0;
+ unsigned char upperlastb=0;
+
+ if(mode==0) {
+ for(x=0;x<width;x++) {
+ dest[0] = 255;
+ dest[1] = src[0];
+ dest[2] = src[1];
+ dest[3] = src[2];
+ dest+=4;
+ src+=3;
+ }
+ }
+ else if(mode==1) {
+ for(x=0;x<width;x++) {
+ dest[0] = 255;
+ dest[1] = src[0]+lastr;
+ dest[2] = src[1]+lastg;
+ dest[3] = src[2]+lastb;
+ lastr = dest[1];
+ lastg = dest[2];
+ lastb = dest[3];
+ dest+=4;
+ src+=3;
+ }
+ }
+ else if(mode==2) {
+ for(x=0;x<width;x++) {
+ dest[0] = 255;
+ dest[1] = src[0]+old[1];
+ dest[2] = src[1]+old[2];
+ dest[3] = src[2]+old[3];
+ dest+=4;
+ old+=4;
+ src+=3;
+ }
+ }
+ else if(mode==3) {
+ for(x=0;x<width;x++) {
+ dest[0] = 255;
+ 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+=3;
+ }
+ }
+ else if(mode==4) {
+ for(x=0;x<width;x++) {
+ dest[0] = 255;
+ 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);
+ lastr = dest[1];
+ lastg = dest[2];
+ lastb = dest[3];
+ upperlastr = old[1];
+ upperlastg = old[2];
+ upperlastb = old[3];
+ dest+=4;
+ old+=4;
+ src+=3;
+ }
+ }
+
}
-TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int scale,
- int id)
+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;
+ lasta = dest[0];
+ 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];
+ upperlasta = 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;
+ unsigned char last=0;
+ unsigned char upperlast=0;
+
+ if(mode==0) {
+ for(x=0;x<width;x++) {
+ *dest = *src;
+ dest++;
+ src++;
+ }
+ }
+ else if(mode==1) {
+ for(x=0;x<width;x++) {
+ *dest = *src+last;
+ last = *dest;
+ dest++;
+ src++;
+ }
+ }
+ else if(mode==2) {
+ for(x=0;x<width;x++) {
+ *dest = *src+*old;
+ dest++;
+ old++;
+ src++;
+ }
+ }
+ else if(mode==3) {
+ for(x=0;x<width;x++) {
+ *dest = *src+(*old+last)/2;
+ dest++;
+ old++;
+ src++;
+ }
+ }
+ else if(mode==4) {
+ for(x=0;x<width;x++) {
+ *dest = *src+PaethPredictor(last,*old,upperlast);
+ last = *dest;
+ upperlast = *old;
+ dest++;
+ old++;
+ src++;
+ }
+ }
+
+}
+
+TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
{
SHAPE *s;
SRECT r;
int len;
U8*data;
U8*imagedata;
+ U8*zimagedata=0;
unsigned long int imagedatalen;
- U8*palette;
- int palettelen;
+ unsigned long int zimagedatalen=0;
+ U8*palette = 0;
+ int palettelen = 0;
+ U8*alphapalette = 0;
+ int alphapalettelen = 0;
struct png_header header;
int bypp;
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
+ 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;
- printf("%d palette\n", len);
+ 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;
}
- printf("IDAT %d -> %d\n", len, imagedatalen);
}
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;
+ 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
+ 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];
+ }
+ if(header.mode==6)
+ applyfilter4(mode, src, old, dest, header.width);
+ else if(header.mode==2)
+ applyfilter3(mode, src, old, dest, header.width);
+ }
+
+ /* 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++) {
- pos++; // filter mode
+ U8*l = &data2[(y*header.width)*4];
for(x=0;x<header.width;x++) {
- U8*src = &imagedata[pos];
- U8*dest = &data2[(y*header.width+x)*4];
- dest[0] = 255;
- dest[1] = src[0];
- dest[2] = src[1];
- dest[3] = src[2];
- pos+=3;
+ if(l[x*4+0]==255) transparent++;
+ else if(l[x*4+0]==0) opaque++;
+ else semitransparent++;
}
}
- swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
+ /* 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)
+#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_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);
+ }
free(data2);
- }
- else {
- RGBA*rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
- U8*data2 = malloc((header.width+4)*header.height);
+ } 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;
- /* 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];
- rgba[i].a = 255;
+ 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 {
+ 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;
+ }
}
+
for(y=0;y<header.height;y++) {
- pos++; //filter mode
- for(x=0;x<header.width;x++) {
- data2[y*header.width+x] =
- imagedata[pos++];
+ int mode = imagedata[pos++]; //filter mode
+ 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];
+ } else {
+ old = &data2[(y-1)*swf_width];
}
+ applyfilter1(mode, src, old, dest, header.width);
}
swf_SetLosslessBitsIndexed(t, header.width, header.height, data2, rgba, palettelen);
+ free(tmpline);
free(rgba);
free(data2);
}
- t = swf_InsertTag(t, ST_DEFINESHAPE);
+ 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);
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);
fprintf(stderr, "%s is not a PNG file!\n", fname);
return -1;
}
- if(head.mode!=2 && head.mode!=3) {
- fprintf(stderr, "%s has unsupported mode %d\n", head.mode);
- return -1;
- }
- if(head.bpp!=8) {
- fprintf(stderr, "%s has unsupported bpp %d\n", head.bpp);
- return -1;
- }
if (global.max_image_width < head.width)
global.max_image_width = head.width;
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"},
-{"s", "scale"}
+{0,0}
};
int args_callback_longoption(char *name, char *val)
int args_callback_command(char *arg, char *next) // actually used as filename
{
char *s;
- int scale;
if (CheckInputFile(arg, &s) < 0) {
if (VERBOSE(1))
fprintf(stderr, "Error opening input file: %s\n", arg);
free(s);
} else {
image[global.nfiles].filename = s;
- image[global.nfiles].scale = global.prescale;
global.nfiles++;
if (global.nfiles >= MAX_INPUT_FILES) {
if (VERBOSE(1))
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 scale (default: autodetect)\n");
- printf("-Y pixel (height) Force movie height to scale (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("The following options can be set independently for each image: -q -s\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;
- global.prescale = 1;
processargs(argc, argv);
+ if(global.nfiles<=0)
+ return 1;
+
if (VERBOSE(2))
fprintf(stderr, "Processing %i file(s)...\n", global.nfiles);
int i;
for (i = 0; i < global.nfiles; i++) {
if (VERBOSE(3))
- fprintf(stderr, "[%03i] %s (1/%i)\n", i,
- image[i].filename,
- image[i].scale);
- t = MovieAddFrame(&swf, t, image[i].filename,
- image[i].scale, (i * 2) + 1);
+ fprintf(stderr, "[%03i] %s\n", i,
+ image[i].filename);
+ t = MovieAddFrame(&swf, t, image[i].filename, (i * 2) + 1);
free(image[i].filename);
}
}
git.asbjorn.biz / swftools.git / blobdiff