[GRASS-SVN] r60835 - grass/trunk/raster/r.patch

[svn_grass at osgeo.org]

Author: hcho
Date: 2014-06-15 23:08:57 -0700 (Sun, 15 Jun 2014)
New Revision: 60835

Modified:
   grass/trunk/raster/r.patch/do_patch.c
Log:
r.patch: rename G_is_zero_value to is_zero_value

Modified: grass/trunk/raster/r.patch/do_patch.c
===================================================================
--- grass/trunk/raster/r.patch/do_patch.c	2014-06-15 19:51:27 UTC (rev 60834)
+++ grass/trunk/raster/r.patch/do_patch.c	2014-06-16 06:08:57 UTC (rev 60835)
@@ -9,7 +9,7 @@
  *          0 the result contains no zero nulls
  */
 
-int G_is_zero_value(void *rast, RASTER_MAP_TYPE data_type)
+int is_zero_value(void *rast, RASTER_MAP_TYPE data_type)
 {
 
     /* insert 0 check here */
@@ -28,14 +28,14 @@
     more = 0;
     while (ncols-- > 0) {
 	if (ZEROFLAG) {		/* use 0 for transparency instead of NULL */
-	    if (G_is_zero_value(result, out_type) ||
+	    if (is_zero_value(result, out_type) ||
 		Rast_is_null_value(result, out_type)) {
 		/* Don't patch hole with a null, just mark as more */
 		if (Rast_is_null_value(patch, out_type))
 		    more = 1;
 		else {
 		    /* Mark that there is more to be done if we patch with 0 */
-		    if (G_is_zero_value(patch, out_type))
+		    if (is_zero_value(patch, out_type))
 			more = 1;
 		    Rast_raster_cpy(result, patch, 1, out_type);
 		    if (out_type == CELL_TYPE)