[GRASS-SVN] r71274 - grass/trunk/imagery/i.ortho.photo/i.ortho.rectify

[svn_grass at osgeo.org]

Author: mmetz
Date: 2017-07-17 14:04:23 -0700 (Mon, 17 Jul 2017)
New Revision: 71274

Modified:
   grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/exec.c
   grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/local_proto.h
   grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/report.c
Log:
i.ortho.rectify: use time_t where needed, else int

Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/exec.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/exec.c	2017-07-17 20:45:55 UTC (rev 71273)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/exec.c	2017-07-17 21:04:23 UTC (rev 71274)
@@ -24,7 +24,7 @@
     struct Categories cats;
     struct History hist;
     int colr_ok, cats_ok;
-    long start_time, rectify_time;
+    time_t start_time, rectify_time;
     double aver_z;
     int elevfd;
     struct cache *ebuffer;
@@ -105,7 +105,7 @@
 	    report(rectify_time - start_time, 1);
 	}
 	else
-	    report((long)0, 0);
+	    report(0, 0);
 
 	G_free(result);
     }

Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/local_proto.h
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/local_proto.h	2017-07-17 20:45:55 UTC (rev 71273)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/local_proto.h	2017-07-17 21:04:23 UTC (rev 71274)
@@ -36,7 +36,7 @@
 void release_cache(struct cache *);
 
 /* report.c */
-int report(long, int);
+int report(int, int);
 
 /* target.c */
 int get_target(char *);

Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/report.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/report.c	2017-07-17 20:45:55 UTC (rev 71273)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/report.c	2017-07-17 21:04:23 UTC (rev 71274)
@@ -1,10 +1,10 @@
 #include <grass/glocale.h>
 #include "global.h"
 
-int report(long rectify, int ok)
+int report(int rectify, int ok)
 {
     int minutes, hours;
-    long seconds;
+    int seconds;
     long ncells;
 
     G_message("%s", ok ? _("complete") : _("failed"));
@@ -20,9 +20,9 @@
     G_verbose_message(_("%d rows, %d cols (%ld cells) completed in"),
 			target_window.rows, target_window.cols, ncells);
     if (hours)
-	G_verbose_message(_("%d:%02d:%02ld hours"), hours, minutes, seconds % 60);
+	G_verbose_message(_("%d:%02d:%02d hours"), hours, minutes, seconds % 60);
     else
-	G_verbose_message(_("%d:%02ld minutes"), minutes, seconds % 60);
+	G_verbose_message(_("%d:%02d minutes"), minutes, seconds % 60);
     if (seconds)
 	G_verbose_message(_("%.1f cells per minute"),
 			  (60.0 * ncells) / ((double)seconds));