int force_height;
int nfiles;
int verbose;
+ int do_cgi;
+ int version;
char *outfile;
} global;
memset(swf, 0x00, sizeof(SWF));
- swf->fileVersion = 5;
+ swf->fileVersion = global.version;
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
+ //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_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(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 (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;
unsigned char lastr=0;
unsigned char lastg=0;
unsigned char lastb=0;
- unsigned char lasta=0;
+ unsigned char lasta=0; //TODO: 255?
unsigned char upperlastr=0;
unsigned char upperlastg=0;
unsigned char upperlastb=0;
- unsigned char upperlasta=0;
+ unsigned char upperlasta=0; //TODO: 255?
if(mode==0) {
for(x=0;x<width;x++) {
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];
else if(mode==3) {
for(x=0;x<width;x++) {
*dest = *src+(*old+last)/2;
+ last = *dest;
dest++;
old++;
src++;
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 */
+ unsigned char* firstline = malloc(header.width*4);
+
for(y=0;y<header.height;y++) {
int mode = imagedata[pos++]; //filter mode
U8*src;
}
if(!y) {
- memset(data2,0,header.width*4);
- old = &data2[y*header.width*4];
+ old = firstline;
+ memset(old, 0, header.width*4); //TODO: fill alpha with 255?
} else {
old = &data2[(y-1)*header.width*4];
}
else if(header.mode==2)
applyfilter3(mode, src, old, dest, header.width);
}
+ free(firstline);
-#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 */
- if(header.mode == 6)
- for(y=0;y<header.height;y++) {
- 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++;
+ a look at the alpha values */
+ if(header.mode == 6) {
+ for(y=0;y<header.height;y++) {
+ U8*l = &data2[(y*header.width)*4];
+ for(x=0;x<header.width;x++) {
+ U8 a = l[x*4];
+ U8 b = l[x*4+1];
+ U8 g = l[x*4+2];
+ U8 r = l[x*4+3];
+ if(a==255) transparent++;
+ else {
+ if(a==0) opaque++;
+ else semitransparent++;
+ l[x*4+3]=(int)r*a/255;
+ l[x*4+2]=(int)g*a/255;
+ l[x*4+1]=(int)b*a/255;
+ }
+ }
+ }
+ if(semitransparent || opaque) {
+ t->id = ST_DEFINEBITSLOSSLESS2;
}
}
- /* 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");
-
- // 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);
- }
+ swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
free(data2);
} else if(header.mode == 0 || header.mode == 3) {
RGBA*rgba;
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;
- }
+ rgba[i].r = ((int)rgba[i].r*rgba[i].a)/255;
+ rgba[i].g = ((int)rgba[i].g*rgba[i].a)/255;
+ rgba[i].b = ((int)rgba[i].b*rgba[i].a)/255;
} else {
rgba[i].a = 255;
}
}
} else {
- palettelen = 256;
+ int mult = (0x1ff>>header.bpp);
+ palettelen = 1<<header.bpp;
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(i=0;i<palettelen;i++) {
+ rgba[i].r = i*mult;
+ rgba[i].g = i*mult;
+ rgba[i].b = i*mult;
}
}
res = 1;
break;
+ case 'z':
+ global.version = 6;
+ res = 0;
+ break;
+
+ case 'C':
+ global.do_cgi = 1;
+ break;
+
case 'v':
if (val)
global.verbose = atoi(val);
return res;
}
-struct options_t options[] =
-{
-{"h", "help"},
-{"o", "output"},
+static struct options_t options[] = {
{"r", "rate"},
+{"o", "output"},
+{"z", "zlib"},
+{"X", "pixel"},
+{"Y", "pixel"},
{"v", "verbose"},
-{"X", "width"},
-{"Y", "height"},
+{"C", "cgi"},
{"V", "version"},
{0,0}
};
void args_callback_usage(char *name)
{
- printf("Usage: %s [-options [value]] imagefiles[.png] [...]\n", name);
- printf("-r framerate (rate) Set movie framerate (frames per second)\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("-z , --zlib <zlib> Enable Flash 6 (MX) Zlib Compression\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;
global.framerate = 1.0;
global.verbose = 1;
+ global.version = 4;
processargs(argc, argv);
-
- if(global.nfiles<=0)
+
+ if(global.nfiles<=0) {
+ fprintf(stderr, "No png files found in arguments\n");
return 1;
+ }
if (VERBOSE(2))
fprintf(stderr, "Processing %i file(s)...\n", global.nfiles);
git.asbjorn.biz / swftools.git / blobdiff