fix type conversion error (on windows) unsigned/signed affecting timestamps on rrd_dump.

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1744 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/src/rrd_dump.c b/program/src/rrd_dump.c
index 82bc81e66ba5586bdcb66a65cd7825ee409f55c3..b23da23504567f051376afe369d22e937c01822a 100644 (file)
--- a/program/src/rrd_dump.c
+++ b/program/src/rrd_dump.c
@@ -394,7 +394,7 @@ static int rrd_dump_opt_r(
         rrd_seek(rrd_file, (rra_start + (rrd.rra_ptr[i].cur_row + 1)
                             * rrd.stat_head->ds_cnt
                             * sizeof(rrd_value_t)), SEEK_SET);
-        timer = -(rrd.rra_def[i].row_cnt - 1);
+        timer = -(long)(rrd.rra_def[i].row_cnt - 1);
         ii = rrd.rra_ptr[i].cur_row;
         for (ix = 0; ix < rrd.rra_def[i].row_cnt; ix++) {
             ii++;

diff --git a/program/src/rrd_first.c b/program/src/rrd_first.c
index 4fb4a4ef10c08e670d521fb193c12d91de9ef597..4da1b3aa1f3574c7324edf82b877927c6fb76ac4 100644 (file)
--- a/program/src/rrd_first.c
+++ b/program/src/rrd_first.c
@@ -82,7 +82,7 @@ time_t rrd_first_r(
              (rra_start +
               (rrd.rra_ptr[rraindex].cur_row + 1) *
               rrd.stat_head->ds_cnt * sizeof(rrd_value_t)), SEEK_SET);
-    timer = -(rrd.rra_def[rraindex].row_cnt - 1);
+    timer = -(long)(rrd.rra_def[rraindex].row_cnt - 1);
     if (rrd.rra_ptr[rraindex].cur_row + 1 > rrd.rra_def[rraindex].row_cnt) {
         rrd_seek(rrd_file, rra_start, SEEK_SET);
     }

diff --git a/program/src/rrd_graph.c b/program/src/rrd_graph.c
index 0de1aa84acb892bb0aaf6a1c2f504e7156af5252..19e3c4033f87fec325a458ef74976d5ed16f7bd8 100644 (file)
--- a/program/src/rrd_graph.c
+++ b/program/src/rrd_graph.c
@@ -3115,6 +3115,10 @@ int graph_paint(
     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);
+    info.u_cnt = im->start;
+    grinfo_push(im, sprintf_alloc("graph_start"), RD_I_CNT, info);
+    info.u_cnt = im->end;
+    grinfo_push(im, sprintf_alloc("graph_end"), RD_I_CNT, info);
 
     /* get actual drawing data and find min and max values */
     if (data_proc(im) == -1)