new function gfxbbox_intersect

[swftools.git] / lib / gfxtools.c

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index 327a0cb..486e285 100644 (file)
--- a/lib/gfxtools.c
+++ b/lib/gfxtools.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <memory.h>
 #include <math.h>
+#include <string.h>
 #include <assert.h>
 #include "gfxtools.h"
 #include "gfxfont.h"
@@ -37,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))) {
@@ -58,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
@@ -80,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
@@ -305,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) {
@@ -346,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;
            }
@@ -614,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;
@@ -780,10 +797,10 @@ void gfxfontlist_free(gfxfontlist_t*list, char deletefonts)
     gfxfontlist_t*l = list;
     while(l) {
        gfxfontlist_t*next = l->next;
-       memset(l, 0, sizeof(*l));
-       if(l->font) {
-           gfxfont_free(l->font);
+       if(deletefonts && l->font) {
+           gfxfont_free(l->font);l->font=0;
        }
+       l->next = 0;
        free(l);
        l = next;
     }