X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxtools.c;h=486e285401782d095ab0901e031fcaff662b891f;hp=56007761c6c31efcc7688d8b984dfb1e91447340;hb=6ac96fe8d278883885cf1b885eade140ab76afe3;hpb=6c3ab5574d31504d24710c2756899d49275c1a37

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index 5600776..486e285 100644
--- a/lib/gfxtools.c
+++ b/lib/gfxtools.c
@@ -615,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;
@@ -781,8 +797,8 @@ void gfxfontlist_free(gfxfontlist_t*list, char deletefonts)
     gfxfontlist_t*l = list;
     while(l) {
 	gfxfontlist_t*next = l->next;
-	if(l->font) {
-	    gfxfont_free(l->font);l->font;
+	if(deletefonts && l->font) {
+	    gfxfont_free(l->font);l->font=0;
 	}
 	l->next = 0;
 	free(l);