From c694e8e2a1528c3266ac80560a2d6e92c559cc01 Mon Sep 17 00:00:00 2001 From: kramm Date: Thu, 8 May 2008 08:12:36 +0000 Subject: [PATCH] made dashing more robust --- lib/gfxtools.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/lib/gfxtools.c b/lib/gfxtools.c index 614cfbd..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); -- 1.7.10.4