[GRASS-SVN] r62132 - in grass/branches/releasebranch_7_0: . lib/rst/interp_float vector/v.surf.rst

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-09-29 11:16:03 -0700 (Mon, 29 Sep 2014)
New Revision: 62132

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/rst/interp_float/input2d.c
   grass/branches/releasebranch_7_0/vector/v.surf.rst/v.surf.rst.html
Log:
v.surf.rst: fix using standard mask and mask as option (merge from trunk, r62131)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60289,60696,61269,61380,61420,61422,61480,61500,61764,61793,61808,61829,61831,61840,61851-61854,61858,61888,61891,61905,61907,61913-61914,61916,61918,61920-61921,61938,61967-61968,61975,61980,61986,61993,62005,62095,62099,62114,62122,62128
   + /grass/trunk:60289,60696,61269,61380,61420,61422,61480,61500,61764,61793,61808,61829,61831,61840,61851-61854,61858,61888,61891,61905,61907,61913-61914,61916,61918,61920-61921,61938,61967-61968,61975,61980,61986,61993,62005,62095,62099,62114,62122,62128,62131

Modified: grass/branches/releasebranch_7_0/lib/rst/interp_float/input2d.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/rst/interp_float/input2d.c	2014-09-29 17:42:10 UTC (rev 62131)
+++ grass/branches/releasebranch_7_0/lib/rst/interp_float/input2d.c	2014-09-29 18:16:03 UTC (rev 62132)
@@ -61,7 +61,8 @@
 	    if (MASK)
 		Rast_get_c_row(MASKfd, MASK, i);
 	    for (j = 0; j < params->nsizc; j++) {
-		if ((cellmask && cellmask[j] == 0) || (MASK && MASK[j] == 0))
+		if ((cellmask && (cellmask[j] == 0 || Rast_is_c_null_value(&cellmask[j]))) || 
+		    (MASK && (MASK[j] == 0 || Rast_is_c_null_value(&MASK[j]))))
 		    BM_set(bitmask, j, irev, 0);
 		else
 		    BM_set(bitmask, j, irev, 1);
@@ -71,9 +72,7 @@
     }
     else
 	bitmask = NULL;
-    
-    if (MASKfd >= 0)
-	Rast_close(MASKfd);
+
     if (cfmask >= 0)
 	Rast_close(cfmask);
 

Modified: grass/branches/releasebranch_7_0/vector/v.surf.rst/v.surf.rst.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.surf.rst/v.surf.rst.html	2014-09-29 17:42:10 UTC (rev 62131)
+++ grass/branches/releasebranch_7_0/vector/v.surf.rst/v.surf.rst.html	2014-09-29 18:16:03 UTC (rev 62132)
@@ -22,7 +22,8 @@
 have time stamp, the program creates time stamp for all output maps.
 
 <p>
-User can define a raster map named <b>mask</b>, which will be used
+User can either use <em><a href="r.mask.html">r.mask</a></em>to set a mask
+or specify a raster map in <b>mask</b> option, which will be used
 as a mask. The approximation is skipped for cells which have zero or
 NULL value in mask. NULL values will be assigned to these cells in all
 output raster maps. Data points are checked for identical points and