X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=e8a2c7c2f72b45d23502d6308df53ee8ce41aa97;hb=15771c177b875ca1f233e8aa725283ce1a559091;hp=d950bd7bec2e4dddfe163758e02e4581a0e9c273;hpb=92013ccec1cef810347d61538e376d53d4a444f3;p=swftools.git diff --git a/src/png2swf.c b/src/png2swf.c index d950bd7..e8a2c7c 100644 --- a/src/png2swf.c +++ b/src/png2swf.c @@ -41,12 +41,19 @@ struct { int do_cgi; int version; char *outfile; + float scale; } global; struct { char *filename; } image[MAX_INPUT_FILES]; +static int custom_move=0; +static int move_x=0; +static int move_y=0; +static int clip_x1=0,clip_y1=0,clip_x2=0,clip_y2=0; +static int custom_clip = 0; + TAG *MovieStart(SWF * swf, float framerate, int dx, int dy) { TAG *t; @@ -56,8 +63,15 @@ TAG *MovieStart(SWF * swf, float framerate, int dx, int dy) swf->fileVersion = global.version; swf->frameRate = (int)(256.0 * framerate); - swf->movieSize.xmax = dx * 20; - swf->movieSize.ymax = dy * 20; + if(custom_clip) { + swf->movieSize.xmin = clip_x1 * 20; + swf->movieSize.ymin = clip_y1 * 20; + swf->movieSize.xmax = clip_x2 * 20; + swf->movieSize.ymax = clip_y2 * 20; + } else { + swf->movieSize.xmax = dx * 20; + swf->movieSize.ymax = dy * 20; + } t = swf->firstTag = swf_InsertTag(NULL, ST_SETBACKGROUNDCOLOR); @@ -315,11 +329,11 @@ void applyfilter4(int mode, U8*src, U8*old, U8*dest, int width) 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>header.bpp); + palettelen = 1<movieSize.xmax - (int) header.width * 20) / 2; - m.ty = (swf->movieSize.ymax - (int) header.height * 20) / 2; + m.sx = (int)(0x10000 * global.scale); + m.sy = (int)(0x10000 * global.scale); + + if(custom_move) { + m.tx = move_x*20; + m.ty = move_y*20; + } else { + m.tx = (swf->movieSize.xmax - (int) (header.width * global.scale * 20)) / 2; + m.ty = (swf->movieSize.ymax - (int) (header.height * global.scale * 20)) / 2; + } swf_ObjectPlace(t, id + 1, 50, &m, NULL, NULL); t = swf_InsertTag(t, ST_SHOWFRAME); @@ -743,9 +804,10 @@ int CheckInputFile(char *fname, char **realname) sprintf(s, "%s.PNG", fname); if ((fi = fopen(s, "rb")) == NULL) { sprintf(s, "%s.Png", fname); - if ((fi = fopen(s, "rb")) == NULL) + if ((fi = fopen(s, "rb")) == NULL) { fprintf(stderr, "Couldn't open %s!\n", fname); return -1; + } } } } @@ -775,7 +837,9 @@ int args_callback_option(char *arg, char *val) case 'r': if (val) global.framerate = atof(val); - if ((global.framerate < 1.0/256) ||(global.framerate >= 256.0)) { + /* removed framerate>0 restriction in order to make + Flash Communication Server compatible SWFs */ + if ((global.framerate < 0) ||(global.framerate >= 256.0)) { if (VERBOSE(1)) fprintf(stderr, "Error: You must specify a valid framerate between 1/256 and 255.\n"); @@ -790,19 +854,36 @@ int args_callback_option(char *arg, char *val) res = 1; break; + case 's': + global.scale = atof(val)/100; + res = 1; + break; + case 'z': - global.version = 6; + if(global.version<6) + global.version = 6; res = 0; break; + case 'T': + global.version = atoi(val); + res = 1; + break; + case 'C': global.do_cgi = 1; break; case 'v': - if (val) - global.verbose = atoi(val); - res = 1; + global.verbose++; + res = 0; + break; + + case 'q': + global.verbose--; + if(global.verbose<0) + global.verbose = 0; + res = 0; break; case 'X': @@ -816,10 +897,48 @@ int args_callback_option(char *arg, char *val) global.force_height = atoi(val); res = 1; break; - + case 'V': printf("png2swf - part of %s %s\n", PACKAGE, VERSION); exit(0); + + case 'c': { + char*s = strdup(val); + char*x1 = strtok(s, ":"); + char*y1 = strtok(0, ":"); + char*x2 = strtok(0, ":"); + char*y2 = strtok(0, ":"); + if(!(x1 && y1 && x2 && y2)) { + fprintf(stderr, "-m option requires four arguments, :::\n"); + exit(1); + } + custom_clip = 1; + clip_x1 = atoi(x1); + clip_y1 = atoi(y1); + clip_x2 = atoi(x2); + clip_y2 = atoi(y2); + free(s); + + res = 1; + break; + } + + case 'm': { + char*s = strdup(val); + char*c = strchr(s, ':'); + if(!c) { + fprintf(stderr, "-m option requires two arguments, :\n"); + exit(1); + } + *c = 0; + custom_move = 1; + move_x = atoi(val); + move_y = atoi(c+1); + free(s); + + res = 1; + break; + } default: res = -1; @@ -839,11 +958,14 @@ static struct options_t options[] = { {"r", "rate"}, {"o", "output"}, {"z", "zlib"}, +{"T", "flashversion"}, {"X", "pixel"}, {"Y", "pixel"}, {"v", "verbose"}, +{"q", "quiet"}, {"C", "cgi"}, {"V", "version"}, +{"s", "scale"}, {0,0} }; @@ -879,11 +1001,14 @@ void args_callback_usage(char *name) printf("-r , --rate Set movie framerate (frames per second)\n"); printf("-o , --output Set name for SWF output file.\n"); printf("-z , --zlib Enable Flash 6 (MX) Zlib Compression\n"); + printf("-T , --flashversion Set the flash version to generate\n"); printf("-X , --pixel Force movie width to (default: autodetect)\n"); printf("-Y , --pixel Force movie height to (default: autodetect)\n"); printf("-v , --verbose Set verbose level (0=quiet, 1=default, 2=debug)\n"); + printf("-q , --quiet Omit normal log messages, only log errors\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("-s , --scale Scale image to % size.\n"); printf("\n"); } @@ -897,6 +1022,7 @@ int main(int argc, char **argv) global.framerate = 1.0; global.verbose = 1; global.version = 4; + global.scale = 1.0; processargs(argc, argv); @@ -909,10 +1035,8 @@ int main(int argc, char **argv) fprintf(stderr, "Processing %i file(s)...\n", global.nfiles); t = MovieStart(&swf, global.framerate, - global.force_width ? global.force_width : global. - max_image_width, - global.force_height ? global.force_height : global. - max_image_height); + global.force_width ? global.force_width : (int)(global.max_image_width*global.scale), + global.force_height ? global.force_height : (int)(global.max_image_height*global.scale)); { int i;