[GRASS-SVN] r59654 - grass/branches/releasebranch_7_0/raster/r.proj

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-04-09 02:55:22 -0700 (Wed, 09 Apr 2014)
New Revision: 59654

Modified:
   grass/branches/releasebranch_7_0/raster/r.proj/main.c
   grass/branches/releasebranch_7_0/raster/r.proj/readcell.c
Log:
r.proj: percent cosmetics
        (merge r59653 from trunk)


Modified: grass/branches/releasebranch_7_0/raster/r.proj/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.proj/main.c	2014-04-09 09:53:19 UTC (rev 59653)
+++ grass/branches/releasebranch_7_0/raster/r.proj/main.c	2014-04-09 09:55:22 UTC (rev 59654)
@@ -494,12 +494,13 @@
 
     xcoord2 = outcellhd.west + (outcellhd.ew_res / 2);
     ycoord2 = outcellhd.north - (outcellhd.ns_res / 2);
+
     G_important_message(_("Projecting..."));
-    G_percent(0, outcellhd.rows, 2);
-
     for (row = 0; row < outcellhd.rows; row++) {
 	/* obufptr = obuffer */;
 
+        G_percent(row, outcellhd.rows - 1, 2);
+
 #if 0
 	/* parallelization does not always work,
 	 * segfaults in the interpolation functions 
@@ -537,7 +538,6 @@
 
 	xcoord2 = outcellhd.west + (outcellhd.ew_res / 2);
 	ycoord2 -= outcellhd.ns_res;
-	G_percent(row, outcellhd.rows - 1, 2);
     }
 
     Rast_close(fdo);

Modified: grass/branches/releasebranch_7_0/raster/r.proj/readcell.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.proj/readcell.c	2014-04-09 09:53:19 UTC (rev 59653)
+++ grass/branches/releasebranch_7_0/raster/r.proj/readcell.c	2014-04-09 09:55:22 UTC (rev 59654)
@@ -60,11 +60,10 @@
 	c->fd = -1;
 	c->fname = NULL;
     }
-    G_message("%.2f percent are kept in memory", 100.0 * nblocks / (nx * ny));
+    G_verbose_message("%.2f percent are kept in memory", 100.0 * nblocks / (nx * ny));
 
-    G_important_message(_("Allocating memory and reading input map..."));
-    G_percent(0, nrows, 5);
-
+    G_important_message(_("Allocating memory and reading input raster map..."));
+    
     for (i = 0; i < c->nblocks; i++)
 	c->refs[i] = -1;
 
@@ -95,7 +94,7 @@
 			   &tmpbuf[(y * nx + x) * BDIM],
 			   BDIM * sizeof(FCELL));
     }
-
+    
     G_free(tmpbuf);
 
     if (c->fd < 0) {