X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxtools.c;h=e3ab3e1f883fe6fe502b3ba036bdc0a547186887;hb=913589b999c8093f636651616995c1f79667e705;hp=dd8d2b714faa6e19d026a4436584fb44436c5758;hpb=3d0dfb65e6fdb0bd5b0d0e10dd70495fcbcbd75d;p=swftools.git

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index dd8d2b7..e3ab3e1 100644
--- a/lib/gfxtools.c
+++ b/lib/gfxtools.c
@@ -21,6 +21,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <memory.h>
 #include <math.h>
 #include <assert.h>
@@ -44,6 +45,7 @@ static void linedraw_moveTo(gfxdrawer_t*d, gfxcoord_t x, gfxcoord_t y)
 	return;
 
     }
+    l->sx = l->sy = 0;
     d->x = l->x = x;
     d->y = l->y = y;
     l->next = 0;
@@ -344,9 +346,10 @@ void gfxline_optimize(gfxline_t*line)
 	if(l->type == gfx_lineTo && next->type == gfx_lineTo) {
 	    double dx = l->x-x;
 	    double dy = l->y-y;
-	    double nx = next->x-x;
-	    double ny = next->y-y;
+	    double nx = next->x-l->x;
+	    double ny = next->y-l->y;
 	    if(fabs(dx*ny - dy*nx) < 0.000001 && (dx*nx + dy*ny) >= 0) {
+		printf("(%f %f) (%f %f)\n", dx, dy, nx, ny);
 		combine = 1;
 	    }
 	} else if(l->type == gfx_splineTo && next->type == gfx_splineTo) {
@@ -777,11 +780,11 @@ void gfxfontlist_free(gfxfontlist_t*list, char deletefonts)
 {
     gfxfontlist_t*l = list;
     while(l) {
-	gfxfontlist_t*next = l;
-	memset(l, 0, sizeof(*l));
+	gfxfontlist_t*next = l->next;
 	if(l->font) {
-	    gfxfont_free(l->font);
+	    gfxfont_free(l->font);l->font;
 	}
+	l->next = 0;
 	free(l);
 	l = next;
     }