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

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

diff --git a/src/rrd_dump.c b/src/rrd_dump.c
index 0b3e7a2d3b1251968cc7114a0cfa7a1fbcc1daae..8e5049ff27a6885721a02934031db1b28ba13724 100644 (file)
--- a/src/rrd_dump.c
+++ b/src/rrd_dump.c
@@ -389,7 +389,7 @@ 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/src/rrd_first.c b/src/rrd_first.c
index f735c0eb7db2ab9c6a6a8d0a1888a0ac44e0e5df..c6d7b3898d79cdec51a7c621fc9b21b625068b6f 100644 (file)
--- a/src/rrd_first.c
+++ b/src/rrd_first.c
@@ -83,7 +83,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/src/rrd_graph.c b/src/rrd_graph.c
index 7c92a227c310c622a69506f617948c9d255a0cf2..3b352fd552b246df5618b37bcb86c6dd8a5659a9 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -3079,6 +3079,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)