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

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index 5600776..cf1937d 100644
--- a/lib/gfxtools.c
+++ b/lib/gfxtools.c
@@ -197,17 +197,32 @@ void gfxtool_draw_dashed_line(gfxdrawer_t*d, gfxline_t*line, float*r, float phas
     double x=0,y=0;
     double linepos,nextpos;
     char on;
-    int apos;
+    int apos=0;
 
     if(line && line->type != gfx_moveTo) {
 	fprintf(stderr, "gfxtool: outline doesn't start with a moveTo");
 	return;
     }
-    if(!r || r[0]<0 || phase<0) {
-	fprintf(stderr, "gfxtool: invalid dashes");
+    if(!r || (r[0]<=0 && r[0]>-0.01)) {
+        // no dashing. just draw the thing
+        while(line) {
+            if(line->type == gfx_moveTo) {
+		d->moveTo(d, line->x, line->y);
+            } else if(line->type == gfx_lineTo) {
+		d->lineTo(d, line->x, line->y);
+            } else if(line->type == gfx_splineTo) {
+		d->splineTo(d, line->sx, line->sy, line->x, line->y);
+            }
+            line = line->next;
+        }
+        return;
+    }
+    if(r[0]<0 || phase<0) {
+	fprintf(stderr, "gfxtool: invalid (negative) dashes: %f, phase=%f", r[0], phase);
 	return;
     }
 
+
     for(;line;line=line->next) {
 	if(line->type == gfx_moveTo) {
 	    d->moveTo(d, line->x, line->y);
@@ -615,6 +630,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 +789,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;
@@ -781,8 +812,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);