X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxtools.c;h=cbe0017bcdeb035afb5bc702585d53a7136af00f;hb=0b58aadc0f2406a13a19649354a1a5ae604ac370;hp=dd6b9adf48d31628ff9163ccdf82673d63ae3724;hpb=cb7a8d34e7e1163897e5c11e36f805ced9bba5dc;p=swftools.git

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index dd6b9ad..cbe0017 100644
--- a/lib/gfxtools.c
+++ b/lib/gfxtools.c
@@ -21,10 +21,12 @@
    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>
 #include "gfxtools.h"
+#include "gfxfont.h"
 
 typedef struct _linedraw_internal
 {
@@ -43,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;
@@ -343,8 +346,8 @@ 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) {
 		combine = 1;
 	    }
@@ -772,12 +775,15 @@ gfxfontlist_t*gfxfontlist_addfont(gfxfontlist_t*list, gfxfont_t*font)
 	return l;
     }
 }
-void gfxfontlist_free(gfxfontlist_t*list)
+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);l->font;
+	}
+	l->next = 0;
 	free(l);
 	l = next;
     }