Changeset 226

Timestamp:

07/04/07 01:15:13

Author:

ralf

Message:

improved svg support

Files:

• trunk/autogen.sh (modified) (1 diff)
• trunk/src/Geom.cpp (added)
• trunk/src/Geom.h (added)
• trunk/src/Makefile.am (modified) (2 diffs)
• trunk/src/SWFAction.h (modified) (1 diff)
• trunk/src/SWFFilter.h (modified) (1 diff)
• trunk/src/SWFGlyphList.h (modified) (1 diff)
• trunk/src/SWFItem.h (modified) (2 diffs)
• trunk/src/SWFList.h (modified) (1 diff)
• trunk/src/SWFShapeMaker.cpp (modified) (9 diffs)
• trunk/src/SWFShapeMaker.h (modified) (4 diffs)
• trunk/src/SWFTag.h (modified) (1 diff)
• trunk/src/codegen/header.xsl (modified) (1 diff)
• trunk/src/codegen/source.xml (modified) (2 diffs)
• trunk/src/swfmill.cpp (modified) (4 diffs)
• trunk/src/swft/Makefile.am (modified) (3 diffs)
• trunk/src/swft/Parser.cpp (added)
• trunk/src/swft/Parser.h (added)
• trunk/src/swft/SVGAttributeParser.cpp (added)
• trunk/src/swft/SVGAttributeParser.h (added)
• trunk/src/swft/SVGColor.cpp (added)
• trunk/src/swft/SVGColor.h (added)
• trunk/src/swft/SVGColors.h (added)
• trunk/src/swft/SVGGradient.cpp (added)
• trunk/src/swft/SVGGradient.h (added)
• trunk/src/swft/SVGPathParser.cpp (added)
• trunk/src/swft/SVGPathParser.h (added)
• trunk/src/swft/SVGPointsParser.cpp (added)
• trunk/src/swft/SVGPointsParser.h (added)
• trunk/src/swft/SVGStyle.cpp (added)
• trunk/src/swft/SVGStyle.h (added)
• trunk/src/swft/SVGTransformParser.cpp (added)
• trunk/src/swft/SVGTransformParser.h (added)
• trunk/src/swft/swft.cpp (modified) (5 diffs)
• trunk/src/swft/swft.h (modified) (3 diffs)
• trunk/src/swft/swft_css.cpp (deleted)
• trunk/src/swft/swft_import_ttf.cpp (modified) (1 diff)
• trunk/src/swft/swft_path.cpp (modified) (2 diffs)
• trunk/src/xslt/simple-import.xslt (modified) (1 diff)
• trunk/src/xslt/simple-svg.xslt (modified) (11 diffs)

trunk/autogen.sh

@@ -10 +10 @@
-xsltproc codegen/mk.xsl codegen/source.xml
-cd ..
-
+ $*

trunk/src/Makefile.am

@@ -36 +36 @@
-swfmill_SOURCES = \
-        base64.c \
+        Geom.cpp \
-        SWFReader.cpp \
-        SWFWriter.cpp \
@@ -62 +63 @@
-noinst_HEADERS = \
-        base64.h \
+        Geom.h \
-        SWFBasic.h \
-        SWFReader.h \

trunk/src/SWFAction.h

@@ -9 +9 @@
-        public:
-                Action();
+                virtual ~Action() {}
-                void setTypeAndLength( int t, int l ) {
-                        // must be called before parse()!

trunk/src/SWFFilter.h

@@ -9 +9 @@
-        public:
-                Filter();
+                virtual ~Filter() {}
-                void setTypeAndLength( int t, int l ) { 
-                        type = t; 

trunk/src/SWFGlyphList.h

@@ -12 +12 @@
-        public:
-                GlyphList();
-
+virtual 
-                virtual bool parse( Reader *r, int end, Context *ctx );
-                virtual void dump( int indent, Context *ctx );

trunk/src/SWFItem.h

@@ -16 +16 @@
-        public:
-                Item();
+                virtual ~Item() {}
-        
-                virtual bool parse( Reader *r, int end, Context *ctx ) = 0;
@@ -40 +41 @@
-        public:
-                Rest();
-
+virtual 
-                virtual bool parse( Reader *r, int end, Context *ctx );
-                virtual void dump( int indent, Context *ctx );

trunk/src/SWFList.h

@@ -44 +44 @@
-                                        } else {
-                                                WARNING("Linked List has First but no Last item\n");
+                                                return NULL;
-                                        }
-                                } else {

trunk/src/SWFShapeMaker.cpp

@@ -4 +4 @@
-#include "SWFItem.h"
-#include "SWF.h"
-
+
+
-
-namespace SWF {
@@ -15 +16 @@
-        offsetx = ofsx;
-        offsety = ofsy;
+        diffx = diffy = 0;
-        lastx = lasty = 0;
-diffx = diff
+smoothx = smooth
-        have_first = false;
-        
-        fillStyle0 = lineStyle = fillStyle1 = -1;
-
-
-
+
-        roundReset();
-
-
-
-
-
+
+
+
-        // append shapesetup (whithout styles, this is glyph only for now)
-        ShapeSetup *setup = new ShapeSetup;
-
-
-
-
-
+
+
+
-                setup->sethasFillStyle0( 1 );
-        }
-
-
+_
+_
-                setup->sethasFillStyle1( 1 );
-        }
-
-
+_
+_
-                setup->sethasLineStyle( 1 );
-        }
-        
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        
-        edges->append( setup );
-
-        minmax( x+(lastx*factorx), y+(lasty*factory) );
-        
-//      fprintf(stderr,"setup %i/%i\n", x, y );
@@ -71 +81 @@
-        edges->append( segment );
-        minmax( x+(lastx*factorx), y+(lasty*factory) );
+
+        lastx += _x; lasty += _y;
-}
-
@@ -76 +88 @@
-        int cx = roundX(factorx * ( _cx ) );
-        int cy = roundY(factory * ( _cy ) );
-
-
-
-
-
+
+
+
+
+
+
+
-        
-        CurveTo *segment = new CurveTo;
@@ -90 +104 @@
-        segment->sety2( y );
-        edges->append( segment );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -174 +206 @@
-
-        cubicToRec( a, b, c, d, .01 );
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // diffx/diffy captures rounding errors. they can accumulate a bit! FIXME
-        
@@ -183 +233 @@
-                fprintf(stderr,"WARNING: shape not closed; closing (%f/%f).\n", diffx, diffy);
-                fprintf(stderr,"DEBUG: accumulated rounding error (%f/%f).\n", roundx, roundy);
+                
+                if(!stroke) {
+                        doSetup( 0, 0, false, -1, -1, 0 );
+                }
+                
-                // closing line
-                LineTo *segment = new LineTo;
@@ -190 +245 @@
-                segment->sety( (int)-diffy );
-                edges->append( segment );
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -202 +264 @@
-
-void ShapeMaker::setupR( double x, double y ) {
-
-
-
-
+
+
-}
-
-void ShapeMaker::setup( double x, double y ) {
-
-
-
-
+
+
-}
-
-void ShapeMaker::lineTo( double x, double y ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/SWFShapeMaker.h

@@ -2 +2 @@
-#define SWF_SHAPEMAKER_H
-
+#include "Geom.h"
-#include <stdio.h>
+#include <libxml/tree.h>
+#include <math.h>
-
-namespace SWF {
@@ -8 +11 @@
-class ShapeItem;
-template <class T> class List;
-
-class Point {
-        public:
-                double x, y;
-                
-                Point( double _x=0, double _y=0 ) {
-                        x = _x; y = _y;
-                }
-                Point( const Point& p ) {
-                        x=p.x; y=p.y;
-                }
-                const Point operator -( const Point& p ) const {
-                        Point p2(x-p.x, y-p.y);
-                        return p2;
-                }
-                Point operator =( const Point& p ) {
-                        x=p.x; y=p.y;
-                        return *this;
-                }
-};
-
-class Bezier {
@@ -51 +34 @@
-                }
-        
-
-
+
+
+
-                void lineTo( double x, double y );
+                void lineToR( double x, double y );
+                
-                void curveTo( double cx, double cy, double ax, double ay );
+                void curveToR( double cx, double cy, double ax, double ay );
+
+                void smoothCurveTo( double ax, double ay );
+                void smoothCurveToR( double ax, double ay );
+
-                void cubicTo( double x1, double y1, double x2, double y2, double ax, double ay );
-
+
+
+
+
+
+
-                void finish();
-        
-
-
-
+
+
+
+
+
+
+
-        
-                double getLastX() { return lastx; }
-                double getLastY() { return lasty; }
-
-MinX() { return min
-MinY() { return min
-
-double getMaxY() { return maxy
+SmoothX() { return smooth
+SmoothY() { return smooth
+
+Rect getBounds() { return Rect(minx, miny, maxx, maxy)
-                
-        protected:
-                void cubicToRec( const Point& a, const Point& b, const Point& c, const Point& d, double k, int iteration=0 );
+
+                void doSetup( double _x=0, double _y=0, bool hasMoveTo=true, int _fillStyle0=-1, int _fillStyle1=-1, int _lineStyle=-1);
+
+                void ellipseSegment( double cx, double cy, double rx, double ry, double phi, double theta, double dTheta);
-        
-                void minmax( double x, double y ) {
@@ -89 +93 @@
-                double factorx, factory;
-                double offsetx, offsety;
+                double diffx, diffy;
-                double lastx, lasty;
-diffx, diff
+lastsetupx, lastsetup
-                double minx, miny, maxx, maxy;
+                double smoothx, smoothy;
-                bool have_first;
-        
-                int fillStyle0, fillStyle1, lineStyle;
-
+
-                // rounding error accumulation compensation
-                double roundx, roundy;

trunk/src/SWFTag.h

@@ -11 +11 @@
-                Tag();
-                void setTypeAndLength( int t, int l );
-int
+void
-                int getType() { return type; }
-                int getLength() { return len; }

trunk/src/codegen/header.xsl

@@ -44 +44 @@
-        public:
-                <xsl:value-of select="@name"/>();
-
+virtual 
-                
-                virtual bool parse( Reader *r, int end, Context *ctx );

trunk/src/codegen/source.xml

@@ -93 +93 @@
-
-        <if expression="jointStyle==2">
-
+
+
-        </if>
-
@@ -614 +615 @@
-        <integer name="count" size="4" constant-size="true"/>
-        <list type="GradientItem" name="gradientColors" length="count" prop="true"/>
-word name="shift
+fixedpoint2 name="shift" signed="true" size="16" constant-size="true" exp="8
-</style>
-

trunk/src/swfmill.cpp

@@ -17 +17 @@
-bool verbose = false;
-bool dump = false;
+bool nonet = false;
-const char *internal_stylesheet = NULL;
-
@@ -60 +61 @@
-                "    -V extra-verbose debugging output\n"
-                "    -d dump SWF data when loaded (for debugging)\n"
+                "    -n deactivate libxml network access"
-                "\n"
-                "E-mail bug reports to "PACKAGE_BUGREPORT"\n\n"
@@ -429 +431 @@
-                                                dump = true;
-                                                break;
+                                        case 'n':
+                                                nonet = true;
+                                                break;
-                                        case '?':
-                                                usage();
@@ -449 +454 @@
-                goto fail;
-        }
+        
+        if( nonet ) xmlSetExternalEntityLoader( xmlNoNetExternalEntityLoader );
-        
-        if( !quiet ) fprintf( stderr, "%s %s\n", PACKAGE_NAME, PACKAGE_VERSION );

trunk/src/swft/Makefile.am

@@ -24 +24 @@
-        swft_document.cpp \
-        swft_path.cpp \
-        swft_css.cpp \
-        swft_import.cpp \
-        swft_import_jpeg.cpp \
@@ -30 +29 @@
-        swft_import_ttf.cpp \
-        swft_import_mp3.cpp \
+        Parser.cpp \
+        SVGStyle.cpp \
+        SVGGradient.cpp \
+        SVGColor.cpp \
+        SVGPathParser.cpp \
+        SVGPointsParser.cpp \
+        SVGTransformParser.cpp \
+        SVGAttributeParser.cpp \
-        readpng.c \
-        $(NULL)
@@ -35 +42 @@
-noinst_HEADERS = \
-        swft.h \
+        Parser.h \
+        SVGStyle.h \
+        SVGGradient.h \
+        SVGColor.h \
+        SVGColors.h \
+        SVGPathParser.h \
+        SVGPointsParser.h \
+        SVGTransformParser.h \
+        SVGAttributeParser.h \
-        readpng.h \
-        $(NULL)

trunk/src/swft/swft.cpp

@@ -11 +11 @@
-#define SWFT_MAPSIZE 32
-
+using namespace SWF;
-
-void *swft_init( xsltTransformContextPtr ctx, const xmlChar *URI );
@@ -42 +43 @@
-void swft_transform( xmlXPathParserContextPtr ctx, int nargs );
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static void swft_nextid( xmlXPathParserContextPtr ctx, int nargs ) {
@@ -146 +191 @@
-        oldID = obj->stringval;
-        newID = c->doMap((const char*)oldID);
-
+
-        xmlFree( oldID );
-        
@@ -180 +225 @@
-        xsltRegisterExtFunction( ctx, (const xmlChar *) "path", SWFT_NAMESPACE, swft_path);
-//      xsltRegisterExtFunction( ctx, (const xmlChar *) "bounds", SWFT_NAMESPACE, swft_bounds);
-        xsltRegisterExtFunction( ctx, (const xmlChar *) "css", SWFT_NAMESPACE, swft_css);
-        xsltRegisterExtFunction( ctx, (const xmlChar *) "css-lookup", SWFT_NAMESPACE, swft_css_lookup);
-        xsltRegisterExtFunction( ctx, (const xmlChar *) "unit", SWFT_NAMESPACE, swft_unit);
-        xsltRegisterExtFunction( ctx, (const xmlChar *) "transform", SWFT_NAMESPACE, swft_transform);
+        xsltRegisterExtElement( ctx, (const xmlChar *) "push-style", SWFT_NAMESPACE, swft_pushstyle);
+        xsltRegisterExtElement( ctx, (const xmlChar *) "pop-style", SWFT_NAMESPACE, swft_popstyle);
+        xsltRegisterExtElement( ctx, (const xmlChar *) "push-gradient", SWFT_NAMESPACE, swft_pushgradient);
-
-        xsltRegisterExtFunction( ctx, (const xmlChar *) "import-jpeg", SWFT_NAMESPACE, swft_import_jpeg );
@@ -200 +245 @@
-}
-
+

trunk/src/swft/swft.h

@@ -6 +6 @@
-#include <stack>
-#include <map>
-
+
+
+
-void swft_register();
-        
@@ -19 +21 @@
-class swft_ctx {
-public:
+        std::stack<SWF::SVGStyle> styles;
+        std::map<std::string, SWF::SVGGradient*> gradients;
-
-        int last_id;
@@ -58 +62 @@
-};
-
-// CSS style stuff
-
-struct CSSColor {
-        CSSColor() {
-                        r=g=b=a=0;
-                };
-                
-        unsigned char r, g, b, a;
-};
-
-struct CSSStyle {
-        CSSStyle() {
-                no_fill = no_stroke = false;
-                width = 0;
-        }
-        
-        bool no_fill, no_stroke;
-        CSSColor fill;
-        CSSColor stroke;
-        double width;
-        
-        std::map<std::string,std::string> styles;
-};
-
-void parse_css_simple( const char *style_str, CSSStyle *style );
-
-#endif

trunk/src/swft/swft_import_ttf.cpp

@@ -203 +203 @@
-                Rectangle *r = new Rectangle();
-        
-
-
-
-
+
+
+
+
+
-        
-                r->setbits( SWFMaxBitsNeeded( true, 3, r->gettop(), r->getright(), r->getbottom() ) );

trunk/src/swft/swft_path.cpp

@@ -1 @@
-#include "SWFShapeMaker.h"
-#include "SWF.h"
-#include "swft.h"
+#include "SVGPathParser.h"
+#include "SVGTransformParser.h"
+#include "SVGAttributeParser.h"
+#include "SVGPointsParser.h"
+#include "SVGStyle.h"
+#include <libxml/xpathInternals.h>
+#include <libxslt/xsltutils.h>
-#include <libxslt/extensions.h>
-#include <libxslt/xsltutils.h>
-#include <libxml/xpathInternals.h>
-
-using namespace SWF;
-
-#define TMP_STRLEN 0xff
-
-// returns true when a segment is finished.
-bool mkShapeSegment( ShapeMaker& shaper, double *coord, int *C, char *tmp, char mode, double *smoothx, double *smoothy ) {
-        bool fin=true;
-        int c = *C;
-        
-        if( tmp[0] ) {
-                *C=c+1;
-                coord[c] = atof( tmp );
-                //fprintf(stderr, "coord[%i]: %i, mode %c, tmp %s\n", c, coord[c], mode, tmp );
-        }
-        if( mode == 'Q' && c==3 ) {
-                shaper.curveTo( coord[0], coord[1], coord[2], coord[3] );
-                *smoothx = coord[2] + (coord[2]-coord[0]);
-                *smoothy = coord[3] + (coord[3]-coord[1]);
-        } else if( mode == 'q' && c==3 ) {
-                shaper.curveToR( coord[0], coord[1], coord[2], coord[3] );
-        } else if( mode == 'T' && c==1 ) {
-                shaper.curveTo( *smoothx, *smoothy, coord[0], coord[1] );
-                *smoothx = coord[0] + (coord[0]-*smoothx);
-                *smoothy = coord[1] + (coord[1]-*smoothy);
-        } else if( mode == 'C' && c==5 ) {
-                shaper.cubicTo( coord[0], coord[1], coord[2], coord[3], coord[4], coord[5] );
-                *smoothx = coord[4] + (coord[4]-coord[2]);
-                *smoothy = coord[5] + (coord[5]-coord[3]);
-        } else if( mode == 'S' && c==3 ) {
-                shaper.cubicTo( *smoothx, *smoothy, coord[0], coord[1], coord[2], coord[3] );
-                *smoothx = coord[2] + (coord[2]-coord[0]);
-                *smoothy = coord[3] + (coord[3]-coord[1]);
-        } else if( mode == 'L' && c==1 ) {
-                shaper.lineTo( coord[0], coord[1] );
-        } else if( mode == 'l' && c==1 ) {
-                shaper.lineToR( coord[0], coord[1] );
-        } else if( mode == 'M' && c==1 ) {
-                shaper.setup( coord[0], coord[1] );
-        } else if( mode == 'm' && c==1 ) {
-                shaper.setupR( coord[0], coord[1] );
-        } else if( mode == 'H' && c==0 ) {
-                shaper.lineTo( coord[0], shaper.getLastY() );
-        } else if( mode == 'V' && c==0 ) {
-                shaper.lineTo( shaper.getLastX(), coord[0] );
-        } else {
-                return false;
-        }
-        return true;
-}
-        
-/*
-        Create a complete DefineShape3 element.
-svg path string>, <id>, <style attr> [, <xofs>, <yofs>]
+node> , <shapeid> , <movie-version>
-*/
-
-
-
-
-
+
+
-