swfmill 0.0.1 → 0.0.2

data/ext/swfmill/src/SWF.h

@@ -28,6 +28,9 @@ struct Context {
 		char tagVersion;
 		bool alpha;
 		bool many_shapes;
+
+		bool convertEncoding;
+		const char *swf_encoding;
 		
 		int fillBits;
 		int lineBits;

data/ext/swfmill/src/SWFFile.cpp

@@ -209,7 +209,7 @@ int File::saveXML( FILE *fp, Context *ctx ) {
 	xmlDocPtr doc = getXML( ctx );
 	if( !doc ) goto fail;
 	
-	xmlDocDumpFormatMemory( doc, (xmlChar**)&data, &size, 1 );
+	xmlDocDumpFormatMemoryEnc( doc, (xmlChar**)&data, &size, "UTF-8", 1 );
 	
 	if( size ) fwrite( data, size, 1, fp );
 

data/ext/swfmill/src/SWFShapeMaker.cpp

@@ -15,9 +15,10 @@ ShapeMaker::ShapeMaker( List<ShapeItem>* e, double fx, double fy, double ofsx, d
 	factory = fy;
 	offsetx = ofsx;
 	offsety = ofsy;
-	diffx = diffy = 0;
-	lastx = lasty = 0;
-	smoothx = smoothy = 0;
+	diffx = diffy = 0.0;
+	lastx = lasty = 0.0;
+	smoothx = smoothy = 0.0;
+	minx = miny = maxx = maxy = 0.0;
 	have_first = false;
 	
 	fillStyle0 = lineStyle = fillStyle1 = -1;

data/ext/swfmill/src/codegen/basics.xsl

@@ -57,7 +57,7 @@ namespace <xsl:value-of select="/format/@format"/> {
 
 // ------------ context structure
 
-Context::Context() {
+Context::Context() : swf_encoding(0) {
 	swfVersion = 0;
 	transientPropsToXML = false;
 	debugTrace = false;
@@ -65,6 +65,7 @@ Context::Context() {
 	isLast = false;
 	tagVersion = 0;
 	quiet = false;
+	convertEncoding = false;
 	<xsl:apply-templates select="//*[@context]" mode="ctor"/>
 }
 

data/ext/swfmill/src/codegen/header.xsl

@@ -31,6 +31,9 @@ struct Context {
 		char tagVersion;
 		bool alpha;
 		bool many_shapes;
+
+		bool convertEncoding;
+		const char *swf_encoding;
 		
 		<xsl:for-each select="contextvariable">
 			<xsl:variable name="tmp">

data/ext/swfmill/src/codegen/parsexml.xsl

@@ -8,11 +8,62 @@
 #include <cctype>
 #include <cstdlib>
 #include "base64.h"
+#include <errno.h>
+#include <iconv.h>
 
 using namespace std;
 
 namespace <xsl:value-of select="/format/@format"/> {
 
+char *fromXmlChar(const Context *ctx, const xmlChar *from_str) {
+	if (ctx-&gt;convertEncoding) {
+		size_t len = strlen((const char *)from_str);
+		iconv_t cd = iconv_open(ctx-&gt;swf_encoding, "UTF-8");
+		if (cd &lt; 0) {
+			fprintf(stderr, "iconv_open failed.\n");
+			char *buf = new char[1];
+			buf[0] = '\0';
+			return buf;
+		}
+		size_t buf_size = (len + 1) * 2;
+		for (;;) {
+			char * const dst = new char[buf_size];
+			size_t inbytesleft = len;
+			size_t outbytesleft = buf_size - 1; // reserve 1 byte for '\0'
+			char *pin = (char*)from_str;
+			char *pout = dst;
+			bool expandbuf = false;
+
+			while (inbytesleft &gt; 0) {
+				size_t r = iconv(cd, &amp;pin, &amp;inbytesleft, &amp;pout, &amp;outbytesleft);
+				if (r == (size_t)-1) {
+					if (errno == E2BIG) {
+						expandbuf = true;
+					} else {
+						// bad input charctor
+						fprintf(stderr, "iconv failed: %s\n", from_str);
+					}
+					break;
+				}
+			}
+			if (expandbuf) {
+				iconv(cd, 0, 0, 0, 0);
+				delete[] dst;
+				buf_size *= 2;
+				continue;
+			}
+			*pout = '\0';
+			iconv_close(cd);
+			return dst;
+		}
+	} else {
+		size_t len = strlen((const char *)from_str) + 1;
+		char *buf = new char[len];
+		strcpy(buf, (const char *)from_str);
+		return buf;
+	}
+}
+
 char *strdupx(const char *src) {
 	char *t = new char[strlen(src)+1];
 	strcpy(t, src);
@@ -174,8 +225,8 @@ void <xsl:value-of select="@name"/>::parseXML( xmlNodePtr node, Context *ctx ) {
 <xsl:template match="string" mode="parsexml">
 	tmp = xmlGetProp( node, (const xmlChar *)"<xsl:value-of select="@name"/>" );
 	if( tmp ) {
-		<xsl:value-of select="@name"/> = strdupx((const char *)tmp);
-                xmlFree(tmp);
+		<xsl:value-of select="@name"/> = fromXmlChar(ctx, (const xmlChar*)tmp);
+		xmlFree(tmp);
 	} else {
 		fprintf(stderr,"WARNING: no <xsl:value-of select="@name"/> property in %s element\n", (const char *)node->name );
 		<xsl:value-of select="@name"/> = strdupx("[undefined]");

data/ext/swfmill/src/codegen/writexml.xsl

@@ -6,9 +6,61 @@
 #include "<xsl:value-of select="/format/@format"/>.h"
 #include "base64.h"
 #include &lt;cstring&gt;
+#include &lt;errno.h&gt;
+#include &lt;iconv.h&gt;
 
 namespace <xsl:value-of select="/format/@format"/> {
 
+xmlChar *toXmlChar(const Context *ctx, const char *from_str) {
+	if (ctx-&gt;convertEncoding) {
+		size_t len = strlen(from_str);
+		iconv_t cd = iconv_open("UTF-8", ctx-&gt;swf_encoding);
+		if (cd &lt; 0) {
+			fprintf(stderr, "iconv_open failed.\n");
+			return xmlCharStrdup("");
+		}
+
+		size_t buf_size = (len + 1) * 2;
+		char *dst;
+		for (;;) {
+			dst = new char[buf_size];
+			size_t inbytesleft = len;
+			size_t outbytesleft = buf_size - 1;
+			char *pin = (char*)from_str;
+			char *pout = dst;
+			bool expandbuf = false;
+
+			while (inbytesleft &gt; 0) {
+				size_t r = iconv(cd, &amp;pin, &amp;inbytesleft, &amp;pout, &amp;outbytesleft);
+				if (r == (size_t)-1) {
+					if (errno == E2BIG) {
+						// buf_size shorten
+						expandbuf = true;
+					} else {
+						//bad input charctor
+						fprintf(stderr, "iconv failed: %s\n", from_str);
+					}
+					break;
+				}
+			}
+			if (expandbuf) {
+				delete[] dst;
+				iconv(cd, 0, 0, 0, 0);
+				buf_size *= 2;
+				continue;
+			}
+                        *pout = '\0';
+			break;
+		}
+		iconv_close(cd);
+		xmlChar *ret = xmlCharStrdup(dst);
+		delete[] dst;
+		return ret;
+	} else {
+		return xmlCharStrdup(from_str);
+	}
+}
+
 #define TMP_STRLEN 0xFF
 
 <xsl:for-each select="type|tag|action|filter|style|stackitem|namespaceconstant|multinameconstant|trait|opcode">
@@ -72,7 +124,8 @@ void <xsl:value-of select="@name"/>::writeXML( xmlNodePtr xml, Context *ctx ) {
 
 <xsl:template match="string" mode="writexml">
 	if( <xsl:value-of select="@name"/> ) {
-		xmlSetProp( node, (const xmlChar *)"<xsl:value-of select="@name"/>", (const xmlChar *)<xsl:value-of select="@name"/> );
+		xmlChar *xmlstr = toXmlChar(ctx, <xsl:value-of select="@name"/>);
+		xmlSetProp(node, (const xmlChar *)"<xsl:value-of select="@name"/>", xmlstr);
 	}
 </xsl:template>
 

data/ext/swfmill/src/swfmill.cpp

@@ -17,6 +17,7 @@ bool quiet = false;
 bool verbose = false;
 bool dump = false;
 bool nonet = false;
+const char *swf_encoding = "UTF-8";
 const char *internal_stylesheet = NULL;
 
 void usage() {
@@ -43,23 +44,21 @@ void usage() {
 		"        <out> is a single SWF file, or (by default) 'stdout'\n"
 		"        (for details, see README)\n"
 		"\n"
-		"    xslt <xsl> <in> [<out>"
-		//" [<param>*]"
-		"]\n"
+		"    xslt <xsl> <in> [<out>]\n"
 		"        transform <in> to <out> as described by <xsl>.\n"
 		"        <xsl> is the XSLT stylesheet,\n"
 		"            and can use the swft: extension.\n"
 		"        <in>  must be some XML (depends on <xsl>)\n"
 		"        <out> is either SWF (when it ends in .swf)\n"
 		"            or XML, by default on 'stdout'\n"
-//		"           <param>* is a whitespace-separated list of name=value\n"
-//		"                 assignments for xsl parameters\n"
 		"\n"
 		"<option>s are:\n"
 		"    -h print this help and quit\n"
 		"    -v verbose output\n"
 		"    -V extra-verbose debugging output\n"
 		"    -d dump SWF data when loaded (for debugging)\n"
+		"    -e specify text encoding in SWF (for SWF 5 and earlier only;\n"
+		"           default: UTF-8).\n"
 		"    -n deactivate libxml network access\n"
 		"\n"
 		"Please report bugs at http://bugs.launchpad.net/swfmill/+filebug\n\n"
@@ -71,7 +70,6 @@ xsltStylesheetPtr xsltParseStylesheetMemory( const char *buffer, int size ) {
 	xmlDocPtr doc = xmlParseMemory( buffer, size );
 	if( !doc ) return NULL;
 	xsltStylesheetPtr ret = xsltParseStylesheetDoc( doc );
-//	xmlFreeDoc( doc );
 	return ret;
 }
 
@@ -83,7 +81,7 @@ int swfmill_swf2xml( int argc, char *argv[] ) {
 
 	File input;
 	unsigned int filesize, size, xmlsize;
-    struct stat filestat;
+	struct stat filestat;
 	char sig;
 	Context ctx;
 
@@ -95,7 +93,7 @@ int swfmill_swf2xml( int argc, char *argv[] ) {
 	infile = argv[0];
 	if( argc>1 ) outfile = argv[1];
 	
-// open files
+	// open files
 	std_in = !strncmp( infile, "stdin", 5 );
 	std_out = !strncmp( outfile, "stdout", 6 );
 	in_fp = std_in ? stdin : fopen( infile, "rb" );
@@ -106,33 +104,37 @@ int swfmill_swf2xml( int argc, char *argv[] ) {
 	
 	if( !quiet ) fprintf(stderr,"Reading from %s\n", infile );
 	
-// stat filesize
-    filesize = (unsigned int)-1;
-    
-    if( !std_in ) {
-        stat( infile, &filestat );
-        filesize = filestat.st_size;
-//        fprintf(stderr,"Filesize: %u\n",filesize);
-    }
-    
-// setup context
+	// stat filesize
+	filesize = (unsigned int)-1;
+	if( !std_in ) {
+		stat( infile, &filestat );
+	filesize = filestat.st_size;
+	}
+	
+	// setup context
 	ctx.debugTrace = verbose;
 	ctx.quiet = quiet;
 
-		// treat input as SWF, produce XML
-		if( (size = input.load( in_fp, &ctx, filesize )) != 0 ) {
-			if( dump ) input.dump();
-			out_fp = std_out ? stdout : fopen( outfile, "wb" );
-			if( !out_fp ) {
-				fprintf(stderr,"ERROR: could not open file %s for writing\n", outfile );
-				goto fail;
-			}
-			if( !quiet ) fprintf(stderr,"Writing XML to %s\n", outfile );
-			if( (xmlsize = input.saveXML( out_fp, &ctx )) != 0 ) {
-				if( !quiet ) fprintf(stderr,"XML saved to %s (%i bytes).\n", outfile, xmlsize );
-				success = true;
-			}
+	// setup encoding conversion.
+	if (strcmp(swf_encoding, "UTF-8")) {
+		ctx.convertEncoding = true;
+		ctx.swf_encoding = swf_encoding;
+	}
+
+	// treat input as SWF, produce XML
+	if( (size = input.load( in_fp, &ctx, filesize )) != 0 ) {
+		if( dump ) input.dump();
+		out_fp = std_out ? stdout : fopen( outfile, "wb" );
+		if( !out_fp ) {
+			fprintf(stderr,"ERROR: could not open file %s for writing\n", outfile );
+			goto fail;
+		}
+		if( !quiet ) fprintf(stderr,"Writing XML to %s\n", outfile );
+		if( (xmlsize = input.saveXML( out_fp, &ctx )) != 0 ) {
+			if( !quiet ) fprintf(stderr,"XML saved to %s (%i bytes).\n", outfile, xmlsize );
+			success = true;
 		}
+	}
 fail:
 	if( in_fp && !std_in ) fclose(in_fp);
 	if( out_fp && !std_out ) fclose(out_fp);
@@ -162,7 +164,7 @@ int swfmill_xml2swf( int argc, char *argv[] ) {
 	infile = argv[0];
 	if( argc>1 ) outfile = argv[1];
 	
-// open files
+	// open files
 	std_in = !strncmp( infile, "stdin", 5 );
 	std_out = !strncmp( outfile, "stdout", 6 );
 	in_fp = std_in ? stdin : fopen( infile, "rb" );
@@ -173,10 +175,16 @@ int swfmill_xml2swf( int argc, char *argv[] ) {
 	
 	if( !quiet ) fprintf(stderr,"Reading from %s\n", infile );
 	
-// setup context
+	// setup context
 	ctx.debugTrace = verbose;
 	ctx.quiet = quiet;
-	
+
+	// setup encoding conversion.
+	if (strcmp(swf_encoding, "UTF-8")) {
+		ctx.convertEncoding = true;
+		ctx.swf_encoding = swf_encoding;
+	}
+
 	{
 		filename = std_in ? "-" : infile ;
 		doc = xmlParseFile( filename );
@@ -212,7 +220,7 @@ int swfmill_xml2swf( int argc, char *argv[] ) {
 		}
 		
 		// treat input as XML, produce SWF
-		input.setXML( doc->xmlRootNode, NULL );
+		input.setXML( doc->xmlRootNode, &ctx );
 		if( dump ) input.dump();
 		out_fp = std_out ? stdout : fopen( outfile, "wb" );
 		if( !out_fp ) {
@@ -438,6 +446,15 @@ int main( int argc, char *argv[] ) {
 						usage();
 						goto fail;
 						break;
+					case 'e':
+						++swallow;
+						if (i+swallow < argc) {
+							swf_encoding = argv[i+swallow];
+						} else {
+							usage();
+							goto fail;
+						}
+						break;
 					default:
 						fprintf(stderr,"ERROR: unknown option %c\n",argv[i][j]);
 						usage();

data/ext/swfmill/src/swft/swft_import_jpeg.cpp

@@ -23,6 +23,62 @@ int getJpegWord( FILE *fp ) {
 	return r;
 }
 
+bool getJpegDimensions (FILE *infile, int &image_width, int &image_height) {
+	image_width = image_height = 0;
+	
+	if (fgetc(infile) != 0xff || fgetc(infile) != 0xd8) {
+		return false;
+	}
+	
+	while (!feof(infile)) {
+		if (fgetc(infile) != 0xff) {
+			return false;
+		}
+		
+		int marker;
+		do {
+			marker = fgetc(infile);
+		} while (marker == 0xff);
+		
+		switch (marker) {
+			case 0xc0:
+			case 0xc1:
+			case 0xc2:
+			case 0xc3:
+			case 0xc5:
+			case 0xc6:
+			case 0xc7:
+			case 0xc9:
+			case 0xca:
+			case 0xcb:
+			case 0xcd:
+			case 0xce:
+			case 0xcf:
+			getJpegWord(infile);
+			fgetc(infile);
+			image_height = getJpegWord(infile);
+			image_width = getJpegWord(infile);
+			fgetc(infile);
+			return true;
+			
+			case 0xda:
+			case 0xd9:
+			return false;
+			
+			default:
+			int length = getJpegWord(infile);
+			if (length < 2) {
+				return false;
+			} else {
+				fseek(infile, length-2, SEEK_CUR);
+			}
+			break;
+		}
+	}
+	
+	return false;
+}
+
 void swft_import_jpeg( xmlXPathParserContextPtr ctx, int nargs ) {
 	xsltTransformContextPtr tctx;
 	unsigned char *filename;
@@ -51,7 +107,6 @@ void swft_import_jpeg( xmlXPathParserContextPtr ctx, int nargs ) {
 	bool quiet = true;
 	xmlXPathObjectPtr quietObj = xsltVariableLookup( tctx, (const xmlChar*)"quiet", NULL );
 	if( quietObj && quietObj->stringval ) { quiet = !strcmp("true",(const char*)quietObj->stringval ); };
-
 	
 	FILE *fp = fopen( (const char *)filename, "rb" );
 	if( !fp ) {
@@ -67,28 +122,19 @@ void swft_import_jpeg( xmlXPathParserContextPtr ctx, int nargs ) {
 	
 	swft_addFileName( node, (const char *)filename );
 	
-	// figure width/height
-	int width=-1, height=-1;
-	while( !feof( fp ) ) { // could do a && width==-1 here, but that captures preview imgs...
-		if( fgetc(fp) == 0xff ) {
-			if( fgetc(fp) == 0xc0 ) {
-				// StartOfFrame
-				// skip length and precision (UGLY, eh?)
-				fgetc(fp); fgetc(fp); fgetc(fp);
-				
-				// read height, width
-				height = getJpegWord( fp );
-				width = getJpegWord( fp );
-			}
-		}
+	unsigned char *data = NULL;
+	int width, height;
+	if (!getJpegDimensions(fp, width, height)) {
+		fprintf(stderr, "WARNING: could not extract dimensions for jpeg %s\n", filename);
+		goto fail;
 	}
+	
 	snprintf(tmp,TMP_STRLEN,"%i", width);
 	xmlSetProp( node, (const xmlChar *)"width", (const xmlChar *)&tmp );
 	snprintf(tmp,TMP_STRLEN,"%i", height);
 	xmlSetProp( node, (const xmlChar *)"height", (const xmlChar *)&tmp );
 	
 	// add data
-	unsigned char *data = NULL;
 	int size, ofs;
 	struct stat filestat;
 	if( stat( (const char *)filename, &filestat ) ) goto fail;