X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxtools.c;h=614cfbd8b9ce4789b1145ab73f8fb7445cd73627;hb=23fc2d528a0f561779f966baea99a96414de82b2;hp=30e72d8e97ab8a176f66514bed84fabe5818cfb4;hpb=c380168b3d22fee8771efbddca1d1775f28a12c1;p=swftools.git

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index 30e72d8..614cfbd 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;
@@ -758,7 +774,7 @@ gfxfontlist_t*gfxfontlist_addfont(gfxfontlist_t*list, gfxfont_t*font)
     gfxfontlist_t*last=0,*l = list;
     while(l) {
 	last = l;
-	if(!strcmp((char*)l->font->id, font->id)) {
+	if(l->font == font) {
 	    return list; // we already know this font
 	}
 	l = l->next;