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;
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);
swf_ShapeNew(&s);
swf_GetMatrix(NULL, &m);
- m.sx = 20 * 0x10000;
- m.sy = 20 * 0x10000;
- fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 0);
+ m.sx = (int)(20 * 0x10000);
+ m.sy = (int)(20 * 0x10000);
+ m.tx = -10;
+ m.ty = -10;
+ fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 1);
swf_SetU16(t, id + 1); // id
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;
+ 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);
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;
+ }
}
}
}
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");
res = 1;
break;
+ case 's':
+ global.scale = atof(val)/100;
+ res = 1;
+ break;
+
case 'z':
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':
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, <x1>:<y1>:<x2>:<y2>\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, <x>:<y>\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;
{"X", "pixel"},
{"Y", "pixel"},
{"v", "verbose"},
+{"q", "quiet"},
{"C", "cgi"},
{"V", "version"},
{0,0}
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("-v , --verbose Be verbose. Use more than one -v for greater effect \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("\n");
global.framerate = 1.0;
global.verbose = 1;
global.version = 4;
+ global.scale = 1.0;
processargs(argc, 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;