fixed 2. x-grid example ... since the lable is valid for the whole day, it must be...

[rrdtool.git] / src / rrd_graph.c

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 8c11868..0e84786 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -3345,34 +3345,36 @@ int graph_paint(
         switch (im->gdes[i].gf) {
         case GF_HRULE:
             if (im->gdes[i].yrule >= im->minval
-                && im->gdes[i].yrule <= im->maxval)
+                && im->gdes[i].yrule <= im->maxval) {
                 cairo_save(im->cr);
-            if (im->gdes[i].dash) {
-                cairo_set_dash(im->cr, im->gdes[i].p_dashes,
-                               im->gdes[i].ndash, im->gdes[i].offset);
+                if (im->gdes[i].dash) {
+                    cairo_set_dash(im->cr, im->gdes[i].p_dashes,
+                                   im->gdes[i].ndash, im->gdes[i].offset);
+                }
+                gfx_line(im,
+                         im->xorigin, ytr(im, im->gdes[i].yrule),
+                         im->xorigin + im->xsize, ytr(im,
+                                                      im->gdes[i].yrule),
+                         1.0, im->gdes[i].col);
+                cairo_stroke(im->cr);
+                cairo_restore(im->cr);
             }
-            gfx_line(im,
-                     im->xorigin, ytr(im, im->gdes[i].yrule),
-                     im->xorigin + im->xsize, ytr(im,
-                                                  im->gdes[i].yrule),
-                     1.0, im->gdes[i].col);
-            cairo_stroke(im->cr);
-            cairo_restore(im->cr);
             break;
         case GF_VRULE:
             if (im->gdes[i].xrule >= im->start
-                && im->gdes[i].xrule <= im->end)
+                && im->gdes[i].xrule <= im->end) {
                 cairo_save(im->cr);
-            if (im->gdes[i].dash) {
-                cairo_set_dash(im->cr, im->gdes[i].p_dashes,
-                               im->gdes[i].ndash, im->gdes[i].offset);
+                if (im->gdes[i].dash) {
+                    cairo_set_dash(im->cr, im->gdes[i].p_dashes,
+                                   im->gdes[i].ndash, im->gdes[i].offset);
+                }
+                gfx_line(im,
+                         xtr(im, im->gdes[i].xrule), im->yorigin,
+                         xtr(im, im->gdes[i].xrule),
+                         im->yorigin - im->ysize, 1.0, im->gdes[i].col);
+                cairo_stroke(im->cr);
+                cairo_restore(im->cr);
             }
-            gfx_line(im,
-                     xtr(im, im->gdes[i].xrule), im->yorigin,
-                     xtr(im, im->gdes[i].xrule),
-                     im->yorigin - im->ysize, 1.0, im->gdes[i].col);
-            cairo_stroke(im->cr);
-            cairo_restore(im->cr);
             break;
         default:
             break;
@@ -3450,6 +3452,9 @@ int gdes_alloc(
     im->gdes[im->gdes_c - 1].rpnp = NULL;
     im->gdes[im->gdes_c - 1].p_dashes = NULL;
     im->gdes[im->gdes_c - 1].shift = 0.0;
+    im->gdes[im->gdes_c - 1].dash = 0;
+    im->gdes[im->gdes_c - 1].ndash = 0;
+    im->gdes[im->gdes_c - 1].offset = 0;
     im->gdes[im->gdes_c - 1].col.red = 0.0;
     im->gdes[im->gdes_c - 1].col.green = 0.0;
     im->gdes[im->gdes_c - 1].col.blue = 0.0;
@@ -4079,7 +4084,7 @@ void rrd_graph_options(
                         if (size > 0) {
                             im->text_prop[propidx].size = size;
                         }
-                        if (strlen(prop) > end) {
+                        if ((int) strlen(prop) > end) {
                             if (prop[end] == ':') {
                                 strncpy(im->text_prop[propidx].font,
                                         prop + end + 1, 255);