[GRASS-SVN] r61338 - in grass/branches/releasebranch_7_0: . raster/r.patch

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-07-22 13:54:12 -0700 (Tue, 22 Jul 2014)
New Revision: 61338

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/raster/r.patch/do_patch.c
Log:
r.patch: rename G_is_zero_value to is_zero_value (trunk, r60835)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60219,60278,60610,60807,60936-60937,61275,61288,61290,61292,61294,61301
   + /grass/trunk:60219,60278,60610,60807,60835,60936-60937,61275,61288,61290,61292,61294,61301

Modified: grass/branches/releasebranch_7_0/raster/r.patch/do_patch.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.patch/do_patch.c	2014-07-22 20:51:08 UTC (rev 61337)
+++ grass/branches/releasebranch_7_0/raster/r.patch/do_patch.c	2014-07-22 20:54:12 UTC (rev 61338)
@@ -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 (use_zero) {		/* 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)