X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Freaders%2Fswf.c;h=5bff2a12001443036cfbf6a02b40e46af3197548;hb=b6ebc39257e2814f08a17d8c179c3991c16053ba;hp=da6d6ae1c6154f263c9bd5c77a41448ecd434ea6;hpb=1d017da61fa7f31ab42a89eacecdca59703de0ce;p=swftools.git

diff --git a/lib/readers/swf.c b/lib/readers/swf.c
index da6d6ae..5bff2a1 100644
--- a/lib/readers/swf.c
+++ b/lib/readers/swf.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include <assert.h>
 #include "../gfxdevice.h"
 #include "../gfxsource.h"
@@ -148,21 +149,27 @@ static gfxgradient_t* convertGradient(GRADIENT*from)
 gfxline_t* swfline_to_gfxline(SHAPELINE*line, int linestyle, int fillstyle0)
 {
     gfxdrawer_t d;
-    SCOORD x=0,y=0;
+    SCOORD x=0,y=0,xx=0,yy=0;
     gfxline_t*l;
     gfxdrawer_target_gfxline(&d);
     if(line && line->type != moveTo) {
 	fprintf(stderr, "Warning: Shape doesn't start with a moveTo\n");
     }
+    xx = line?line->x+1:0;
     while(line) {
-	if(line->fillstyle0 == fillstyle0 || line->fillstyle1 == fillstyle0 || 
+	if(line->fillstyle0 == fillstyle0 || 
+	   line->fillstyle1 == fillstyle0 || 
 	   line->linestyle == linestyle) {
 	    if(line->type == lineTo) {
-		d.moveTo(&d, x/20.0,y/20.0);
+		if(xx!=x || yy!=y) d.moveTo(&d, x/20.0,y/20.0);
 		d.lineTo(&d, line->x/20.0,line->y/20.0);
+		xx = line->x;
+		yy = line->y;
 	    } else if(line->type == splineTo) {
-		d.moveTo(&d, x/20.0,y/20.0);
+		if(xx!=x || yy!=y) d.moveTo(&d, x/20.0,y/20.0);
 		d.splineTo(&d, line->sx/20.0, line->sy/20.0, line->x/20.0,line->y/20.0);
+		xx = line->x;
+		yy = line->y;
 	    }
 	}
 	x = line->x;
@@ -227,7 +234,15 @@ static void renderFilled(render_t*r, gfxline_t*line, FILLSTYLE*f, CXFORM*cx, MAT
     } else if(f->type == FILL_LINEAR || f->type == FILL_RADIAL) {
 	gfxmatrix_t m;
 	gfxgradient_t* g;
-	convertMatrix(&f->m, &m);
+	MATRIX* m2 = &f->m;
+	//swf_MatrixJoin(&m2, po_m, &f->m);
+
+	double z = f->type==FILL_RADIAL?4:4;
+	m.m00 = m2->sx/z/20.0; m.m10 = m2->r1/z/20.0;
+	m.m01 = m2->r0/z/20.0; m.m11 = m2->sy/z/20.0;
+	m.tx = m2->tx/20.0;
+	m.ty = m2->ty/20.0;
+
 	g = convertGradient(&f->gradient);
 	r->device->fillgradient(r->device, line, g, f->type == FILL_LINEAR ? gfxgradient_linear : gfxgradient_radial, &m);
 	free(g);
@@ -591,15 +606,13 @@ void swfpage_render(gfxpage_t*page, gfxdevice_t*output)
 
     int t;
     for(t=0;t<65536;t++) {
+	if(depths->ids[t]) {
+	    placeObject(&r, t, depths->ids[t]);
+	}
         int i;
-
         for(i=0; i<r.clips_waiting[t]; i++) {
             output->endclip(output);
         }
-
-	if(depths->ids[t]) {
-	    placeObject(&r, t, depths->ids[t]);
-	}
     }
     free(r.clips_waiting);
 }
@@ -619,7 +632,7 @@ void swf_doc_destroy(gfxdocument_t*gfx)
     free(gfx);gfx=0;
 }
 
-void swf_doc_set_parameter(gfxdocument_t*gfx, const char*name, const char*value)
+void swf_doc_setparameter(gfxdocument_t*gfx, const char*name, const char*value)
 {
     swf_doc_internal_t*i= (swf_doc_internal_t*)gfx->internal;
 }
@@ -647,7 +660,7 @@ gfxpage_t* swf_doc_getpage(gfxdocument_t*doc, int page)
     return swf_page;
 }
 
-void swf_set_parameter(gfxsource_t*src, const char*name, const char*value)
+void swf_setparameter(gfxsource_t*src, const char*name, const char*value)
 {
     msg("<verbose> setting parameter %s to \"%s\"", name, value);
 }
@@ -692,18 +705,26 @@ gfxdocument_t*swf_open(gfxsource_t*src, const char*filename)
     swf_doc->internal = i;
     swf_doc->get = 0;
     swf_doc->destroy = swf_doc_destroy;
-    swf_doc->set_parameter = swf_doc_set_parameter;
+    swf_doc->setparameter = swf_doc_setparameter;
     swf_doc->getpage = swf_doc_getpage;
 
     return swf_doc;
 }
 
+static void swf_destroy(gfxsource_t*src)
+{
+    memset(src, 0, sizeof(*src));
+    free(src);
+}
+
+
 gfxsource_t*gfxsource_swf_create()
 {
     gfxsource_t*src = (gfxsource_t*)malloc(sizeof(gfxsource_t));
     memset(src, 0, sizeof(gfxsource_t));
-    src->set_parameter = swf_set_parameter;
+    src->setparameter = swf_setparameter;
     src->open = swf_open;
+    src->destroy = swf_destroy;
     return src;
 }