X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=03027b13b80263f57336b79f7d82547d0364883c;hb=d38f649c3e9f0dbfbd80a86eb94ef7970e4a376c;hp=e671f78617663dbf8f4f12dfa4d5137837b18551;hpb=3a6b666c896811137d1ad633c0ba0434a34b1555;p=rrdtool.git diff --git a/src/rrd_graph.c b/src/rrd_graph.c index e671f78..03027b1 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008 **************************************************************************** * rrd__graph.c produce graphs from data in rrdfiles ****************************************************************************/ @@ -2950,8 +2950,8 @@ int graph_paint( rrd_infoval_t info; PangoFontMap *font_map = pango_cairo_font_map_get_default(); - /* if we are lazy and there is nothing to PRINT ... quit now */ - if (lazy && im->prt_c == 0) { + /* if we want and can be lazy ... quit now */ + if (lazy) { info.u_cnt = im->ximg; grinfo_push(im, sprintf_alloc("image_width"), RD_I_CNT, info); info.u_cnt = im->yimg; @@ -3667,10 +3667,15 @@ rrd_info_t *rrd_graph_v( if (im.imginfo) { rrd_infoval_t info; - + char *filename; + filename=im.graphfile+strlen(im.graphfile); + while(filename > im.graphfile) { + if (*(filename-1)=='/' || *(filename-1)=='\\' ) break; + filename--; + } info.u_str = sprintf_alloc(im.imginfo, - im.graphfile, + filename, (long) (im.zoom * im.ximg), (long) (im.zoom * im.yimg)); grinfo_push(&im, sprintf_alloc("image_info"), RD_I_STR, info);