X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=d2e495ad87071ec4bee1c14321ccd7e6e7c7e4fe;hb=06f07675a6134fed4f3b3d7bf19978ed22df2e9c;hp=b03a11dee6f2dfc351b0a3f08682544438523ad2;hpb=ca7c0df2c3399b27b6ed4157908a33df6cb23e2f;p=swftools.git

diff --git a/src/png2swf.c b/src/png2swf.c
index b03a11d..d2e495a 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);
 
@@ -686,8 +700,8 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 
     swf_ShapeNew(&s);
     swf_GetMatrix(NULL, &m);
-    m.sx = 20 * 0x10000;
-    m.sy = 20 * 0x10000;
+    m.sx = (int)(20 * 0x10000);
+    m.sy = (int)(20 * 0x10000);
     m.tx = -10;
     m.ty = -10;
     fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 1);
@@ -715,8 +729,16 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int 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);
@@ -796,11 +818,21 @@ 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;
 	    res = 0;
 	    break;
 
+	case 'T':
+	    global.version = atoi(val);
+	    res = 1;
+	    break;
+
 	case 'C':
 	    global.do_cgi = 1;
 	    break;
@@ -832,6 +864,44 @@ int args_callback_option(char *arg, char *val)
 	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;
@@ -911,6 +981,7 @@ int main(int argc, char **argv)
     global.framerate = 1.0;
     global.verbose = 1;
     global.version = 4;
+    global.scale = 1.0;
 
     processargs(argc, argv);
     
@@ -923,10 +994,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;