X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfc.c;h=4f42b106889c41543237f4f6009408a9a9715a32;hb=15771c177b875ca1f233e8aa725283ce1a559091;hp=db5ae8b762666b7be7efcf8ea90b77f484ffda0f;hpb=091232d4bdf4e0e90efcd53b3057e236d9c8705d;p=swftools.git

diff --git a/src/swfc.c b/src/swfc.c
index db5ae8b..4f42b10 100644
--- a/src/swfc.c
+++ b/src/swfc.c
@@ -44,10 +44,12 @@ static char * outputname = "output.swf";
 static int verbose = 2;
 static int optimize = 0;
 static int override_outputname = 0;
+static int do_cgi = 0;
 
 static struct options_t options[] = {
 {"h", "help"},
 {"V", "version"},
+{"C", "cgi"},
 {"v", "verbose"},
 {"o", "output"},
 {0,0}
@@ -68,6 +70,10 @@ int args_callback_option(char*name,char*val)
 	optimize = 1;
 	return 0;
     }
+    else if(!strcmp(name, "C")) {
+	do_cgi = 1;
+	return 0;
+    }
     else if(!strcmp(name, "v")) {
 	verbose ++;
 	return 0;
@@ -89,6 +95,7 @@ void args_callback_usage(char *name)
     printf("\n");
     printf("-h , --help                    Print short help message and exit\n");
     printf("-V , --version                 Print version info and exit\n");
+    printf("-C , --cgi                     Output to stdout (for use in CGI environments)\n");
     printf("-v , --verbose                 Increase verbosity. \n");
     printf("-o , --output <filename>       Set output file to <filename>.\n");
     printf("\n");
@@ -119,7 +126,7 @@ static void syntaxerror(char*format, ...)
     va_start(arglist, format);
     vsprintf(buf, format, arglist);
     va_end(arglist);
-    printf("\"%s\", line %d column %d: error- %s\n", filename, line, column, buf);
+    fprintf(stderr, "\"%s\", line %d column %d: error- %s\n", filename, line, column, buf);
     exit(1);
 }
 
@@ -130,7 +137,7 @@ static void warning(char*format, ...)
     va_start(arglist, format);
     vsprintf(buf, format, arglist);
     va_end(arglist);
-    printf("\"%s\", line %d column %d: warning- %s\n", filename, line, column, buf);
+    fprintf(stderr, "\"%s\", line %d column %d: warning- %s\n", filename, line, column, buf);
 }
 
 static void readToken()
@@ -673,11 +680,16 @@ static void s_endSWF()
 	warning("Empty bounding box for movie");
     }
     
-    fi = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644);
+    if(do_cgi)
+	fi = fileno(stdout);
+    else
+	fi = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644);
     if(fi<0) {
 	syntaxerror("couldn't create output file %s", filename);
     }
-    if(swf->compressed) 
+    if(do_cgi)
+	{if(swf_WriteCGI(swf)<0) syntaxerror("WriteCGI() failed.\n");}
+    else if(swf->compressed) 
 	{if(swf_WriteSWC(fi, swf)<0) syntaxerror("WriteSWC() failed.\n");}
     else
 	{if(swf_WriteSWF(fi, swf)<0) syntaxerror("WriteSWF() failed.\n");}
@@ -1027,7 +1039,7 @@ void s_image(char*name, char*type, char*filename, int quality)
     int imageID = id;
     int width, height;
     if(!strcmp(type,"jpeg")) {
-#ifndef HAVE_LIBJPEG
+#ifndef HAVE_JPEGLIB
 	warning("no jpeg support compiled in");
 	s_box(name, 0, 0, black, 20, 0);
 	return;
@@ -1510,13 +1522,17 @@ void s_includeswf(char*name, char*filename)
 	    level--;
 	if(!level)
 	    break;
-	/* We simply dump all tags right after the sprite
-	   header, relying on the fact that swf_OptimizeTagOrder() will
-	   sort things out for us later. 
-	   We also rely on the fact that the imported SWF is well-formed.
-	 */
-	tag = swf_InsertTag(tag, ftag->id);
-	swf_SetBlock(tag, ftag->data, ftag->len);
+
+	if(ftag->id != ST_SETBACKGROUNDCOLOR) {
+	    /* We simply dump all tags right after the sprite
+	       header, relying on the fact that swf_OptimizeTagOrder() will
+	       sort things out for us later. 
+	       We also rely on the fact that the imported SWF is well-formed.
+	     */
+	    tag = swf_InsertTag(tag, ftag->id);
+	    swf_SetBlock(tag, ftag->data, ftag->len);
+	}
+
 	ftag = ftag->next;
     }
     if(!ftag)
@@ -1741,7 +1757,7 @@ typedef int command_func_t(map_t*args);
 
 SRECT parseBox(char*str)
 {
-    SRECT r;
+    SRECT r = {0,0,0,0};
     float xmin, xmax, ymin, ymax;
     char*x = strchr(str, 'x');
     char*d1=0,*d2=0;
@@ -3192,7 +3208,7 @@ int main (int argc,char ** argv)
     
     file = generateTokens(filename);
     if(!file) {
-	printf("parser returned error.\n");
+	fprintf(stderr, "parser returned error.\n");
 	return 1;
     }
     pos=0;