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

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index dd6b9ad..30e72d8 100644
--- a/lib/gfxtools.c
+++ b/lib/gfxtools.c
@@ -21,10 +21,13 @@
    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 <string.h>
 #include <assert.h>
 #include "gfxtools.h"
+#include "gfxfont.h"
 
 typedef struct _linedraw_internal
 {
@@ -35,7 +38,7 @@ typedef struct _linedraw_internal
 static void linedraw_moveTo(gfxdrawer_t*d, gfxcoord_t x, gfxcoord_t y)
 {
     linedraw_internal_t*i = (linedraw_internal_t*)d->internal;
-    gfxline_t*l = rfx_alloc(sizeof(gfxline_t));
+    gfxline_t*l = (gfxline_t*)rfx_alloc(sizeof(gfxline_t));
     l->type = gfx_moveTo;
     if((int)((d->x * 5120) == (int)(x * 5120)) &&
        (int)((d->y * 5120) == (int)(y * 5120))) {
@@ -43,6 +46,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;
@@ -55,7 +59,7 @@ static void linedraw_moveTo(gfxdrawer_t*d, gfxcoord_t x, gfxcoord_t y)
 static void linedraw_lineTo(gfxdrawer_t*d, gfxcoord_t x, gfxcoord_t y)
 {
     linedraw_internal_t*i = (linedraw_internal_t*)d->internal;
-    gfxline_t*l = rfx_alloc(sizeof(gfxline_t));
+    gfxline_t*l = (gfxline_t*)rfx_alloc(sizeof(gfxline_t));
 
     if(!i->start) {
 	/* starts with a line, not with a moveto. That needs we first
@@ -77,7 +81,7 @@ static void linedraw_lineTo(gfxdrawer_t*d, gfxcoord_t x, gfxcoord_t y)
 static void linedraw_splineTo(gfxdrawer_t*d, gfxcoord_t sx, gfxcoord_t sy, gfxcoord_t x, gfxcoord_t y)
 {
     linedraw_internal_t*i = (linedraw_internal_t*)d->internal;
-    gfxline_t*l = rfx_alloc(sizeof(gfxline_t));
+    gfxline_t*l = (gfxline_t*)rfx_alloc(sizeof(gfxline_t));
 
     if(!i->start) {
 	/* starts with a line, not with a moveto. That needs we first
@@ -302,7 +306,7 @@ gfxline_t * gfxline_clone(gfxline_t*line)
     gfxline_t*dest = 0;
     gfxline_t*pos = 0;
     while(line) {
-	gfxline_t*n = rfx_calloc(sizeof(gfxline_t));
+	gfxline_t*n = (gfxline_t*)rfx_calloc(sizeof(gfxline_t));
 	*n = *line;
 	n->next = 0;
 	if(!pos) {
@@ -343,8 +347,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 +776,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(deletefonts && l->font) {
+	    gfxfont_free(l->font);l->font=0;
+	}
+	l->next = 0;
 	free(l);
 	l = next;
     }