projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix error "cairo_restore without matching cairo_save" when zero-time point is out...
[rrdtool.git]
/
src
/
rrd_graph.c
diff --git
a/src/rrd_graph.c
b/src/rrd_graph.c
index
8c11868
..
56f509a
100644
(file)
--- a/
src/rrd_graph.c
+++ b/
src/rrd_graph.c
@@
-3346,6
+3346,7
@@
int graph_paint(
case GF_HRULE:
if (im->gdes[i].yrule >= im->minval
&& im->gdes[i].yrule <= im->maxval)
case GF_HRULE:
if (im->gdes[i].yrule >= im->minval
&& 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,
cairo_save(im->cr);
if (im->gdes[i].dash) {
cairo_set_dash(im->cr, im->gdes[i].p_dashes,
@@
-3358,10
+3359,12
@@
int graph_paint(
1.0, im->gdes[i].col);
cairo_stroke(im->cr);
cairo_restore(im->cr);
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)
break;
case GF_VRULE:
if (im->gdes[i].xrule >= im->start
&& 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,
cairo_save(im->cr);
if (im->gdes[i].dash) {
cairo_set_dash(im->cr, im->gdes[i].p_dashes,
@@
-3373,6
+3376,7
@@
int graph_paint(
im->yorigin - im->ysize, 1.0, im->gdes[i].col);
cairo_stroke(im->cr);
cairo_restore(im->cr);
im->yorigin - im->ysize, 1.0, im->gdes[i].col);
cairo_stroke(im->cr);
cairo_restore(im->cr);
+ }
break;
default:
break;
break;
default:
break;
@@
-3450,6
+3454,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].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;
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;