X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_gfx.c;h=d26e3cb317a14b401cfdaa3ebfc594205f781aa0;hb=155eeedf23685ed46c5c6660c8e7766927e0057b;hp=3335e9133394c60e902258e677a96e09371f7a60;hpb=ebb7112c8b334b073c17b5686733cc8470384fae;p=rrdtool.git diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c index 3335e91..d26e3cb 100644 --- a/src/rrd_gfx.c +++ b/src/rrd_gfx.c @@ -372,7 +372,6 @@ gfx_string gfx_string_create(FT_Face face,const char *text, unsigned int n; int error; int gottab = 0; - ft_pen.x = 0; /* start at (0,0) !! */ ft_pen.y = 0; @@ -390,12 +389,13 @@ gfx_string gfx_string_create(FT_Face face,const char *text, use_kerning = FT_HAS_KERNING(face); previous = 0; glyph = string->glyphs; - for (n=0; ncount; n++, glyph++) { + for (n=0; ncount;glyph++) { FT_Vector vec; /* handle the tabs ... have a witespace glyph inserted, but set its width such that the distance of the new right edge is x times tabwidth from 0,0 where x is an integer. */ unsigned char letter = text[n]; + gottab = 0; if (letter == '\\' && n+1 < string->count && text[n+1] == 't'){ /* we have a tab here so skip the backslash and @@ -470,16 +470,19 @@ gfx_string gfx_string_create(FT_Face face,const char *text, /* increment number of glyphs */ previous = glyph->index; string->num_glyphs++; + n++; + } /* printf ("number of glyphs = %d\n", string->num_glyphs);*/ compute_string_bbox( string ); /* the last character was a tab */ - if (gottab) { + /* if (gottab) { */ string->width = ft_pen.x; - } else { + /* } else { string->width = string->bbox.xMax - string->bbox.xMin; - } + } */ string->height = string->bbox.yMax - string->bbox.yMin; + return string; }