X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.c;h=594c9f6df525375f6dda0d5deea4d780c21172c2;hp=549e08c783d097e006af7335faf56f9414a86ba5;hb=afdc1dabafc566180b57ec64c9c5504c2c8e2775;hpb=b1deabf87933e51ec589619aefcfb4ab34aeea32 diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 549e08c..594c9f6 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -6,11 +6,16 @@ #include -#include + +/* for basename */ +#ifdef HAVE_LIBGEN_H +# include +#eles +#include "plbasename.h" +#endif #ifdef WIN32 #include "strftime.h" -#include "plbasename.h" #endif #include "rrd_tool.h" @@ -3200,14 +3205,6 @@ int graph_paint( // PangoFontMap *font_map = pango_cairo_font_map_get_default(); - /* 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; - grinfo_push(im, sprintf_alloc("image_height"), RD_I_CNT, info); - return 0; - } /* pull the data from the rrd files ... */ if (data_fetch(im) == -1) return -1; @@ -3223,7 +3220,8 @@ int graph_paint( if (i < 0) return -1; - if ((i == 0) || lazy) + /* if we want and can be lazy ... quit now */ + if (i == 0) return 0; /************************************************************** @@ -3250,6 +3248,10 @@ int graph_paint( info.u_cnt = im->end; grinfo_push(im, sprintf_alloc("graph_end"), RD_I_CNT, info); + /* if we want and can be lazy ... quit now */ + if (lazy) + return 0; + /* get actual drawing data and find min and max values */ if (data_proc(im) == -1) return -1; @@ -3267,6 +3269,7 @@ int graph_paint( info.u_val = im->maxval; grinfo_push(im, sprintf_alloc("value_max"), RD_I_VAL, info); + if (!calc_horizontal_grid(im)) return -1; /* reset precalc */