X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxtools.c;h=486e285401782d095ab0901e031fcaff662b891f;hb=f58dce81384e4324f00f4ca51830f3245d15136b;hp=eeb1a7a6203c86399d676756cc369f8aed710a92;hpb=2db9a5dc2ed4ae59e250fedf293a6fec811d496a;p=swftools.git

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index eeb1a7a..486e285 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;
 	    }
@@ -611,6 +615,22 @@ gfxbbox_t gfxbbox_expand_to_point(gfxbbox_t box, gfxcoord_t x, gfxcoord_t y)
     return box;
 }
 
+void gfxbbox_intersect(gfxbbox_t*box1, gfxbbox_t*box2)
+{
+    if(box2->xmin > box1->xmin)
+	box1->xmin = box2->xmin;
+    if(box2->ymin > box1->ymin)
+	box1->ymin = box2->ymin;
+    if(box2->xmax < box1->xmax)
+	box1->xmax = box2->xmax;
+    if(box2->ymax > box1->ymax)
+	box1->ymax = box2->ymax;
+    if(box1->xmin > box1->xmax)
+	box1->xmax = box1->xmin;
+    if(box1->ymin > box1->ymax)
+	box1->ymax = box1->ymin;
+}
+
 gfxbbox_t gfxline_getbbox(gfxline_t*line)
 {
     gfxcoord_t x=0,y=0;
@@ -772,6 +792,19 @@ gfxfontlist_t*gfxfontlist_addfont(gfxfontlist_t*list, gfxfont_t*font)
 	return l;
     }
 }
+void gfxfontlist_free(gfxfontlist_t*list, char deletefonts)
+{
+    gfxfontlist_t*l = list;
+    while(l) {
+	gfxfontlist_t*next = l->next;
+	if(deletefonts && l->font) {
+	    gfxfont_free(l->font);l->font=0;
+	}
+	l->next = 0;
+	free(l);
+	l = next;
+    }
+}
 
 gfxline_t*gfxline_makerectangle(int x1,int y1,int x2, int y2)
 {