[GRASS-SVN] r65011 - grass-addons/grass7/vector/v.vol.idw

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-04-07 02:47:42 -0700 (Tue, 07 Apr 2015)
New Revision: 65011

Modified:
   grass-addons/grass7/vector/v.vol.idw/main.c
Log:
v.vol.idw Addon: use G_malloc()/G_free(); msg cosmetics

Modified: grass-addons/grass7/vector/v.vol.idw/main.c
===================================================================
--- grass-addons/grass7/vector/v.vol.idw/main.c	2015-04-07 09:42:07 UTC (rev 65010)
+++ grass-addons/grass7/vector/v.vol.idw/main.c	2015-04-07 09:47:42 UTC (rev 65011)
@@ -183,7 +183,7 @@
     Rast3d_get_window(&region);
     Rast3d_read_window(&region, NULL);
     
-    fprintf(stderr,"Region from getWindow: %d %d %d\n", region.rows, region.cols, region.depths);
+    G_debug(1, "Region from getWindow: %d %d %d", region.rows, region.cols, region.depths);
     map3d = Rast3d_open_new_opt_tile_size(output->answer, RASTER3D_USE_CACHE_DEFAULT, &region, FCELL_TYPE, 32);
     if (map3d == NULL)
         G_fatal_error(_("Unable to create output map"));
@@ -195,17 +195,18 @@
     lev_res = region.tb_res;
     sz = Nr * Nc * Nl;
     /*start the interpolation*/
-    data = (float *) malloc( sz * sizeof(float) );
+    data = (float *) G_malloc( sz * sizeof(float) );
     if (!data)
         G_fatal_error(_("Error: out of memory\n"));
 
     nsearch = npts < search_points ? npts : search_points; /*nsearch will get the value one of the minimum */
-    fprintf (stderr, "Interpolating raster map <%s> ... %d levels ... ", output->answer, Nl);
+    G_message(_("Interpolating raster map <%s> ... %d levels ... "), output->answer, Nl);
 
     cnt=0;
     z = region.top + lev_res/2.0;
     for (lev = 0; lev < Nl; lev++)
     {
+        G_message(_("Processing level %d"), lev + 1);
         z -=lev_res;
         y = region.north + region.ns_res/2.0;
         for (row = 0; row < Nr; row++)
@@ -277,11 +278,11 @@
             }/*cols*/
         }/*rows*/
     }/*levels*/
-    free(data);
+    G_free(data);
     
     if (!Rast3d_close(map3d))
         G_fatal_error(_("Unable to close new 3d raster map"));
-    fprintf (stderr, "Done\n");
+    G_done_msg(" ");
     exit(EXIT_SUCCESS);
 }