[GRASS-SVN] r65198 - grass/branches/releasebranch_7_0/vector/v.vol.rst

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-05-08 14:17:05 -0700 (Fri, 08 May 2015)
New Revision: 65198

Modified:
   grass/branches/releasebranch_7_0/vector/v.vol.rst/user3.c
Log:
v.vol.rst: do not ignore null values in cross_input, causes serious slow down on Windows (merge from trunk, r64783)

Modified: grass/branches/releasebranch_7_0/vector/v.vol.rst/user3.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vol.rst/user3.c	2015-05-08 21:15:20 UTC (rev 65197)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/user3.c	2015-05-08 21:17:05 UTC (rev 65198)
@@ -443,7 +443,9 @@
 		    dyy = 0.;
 		    dyz = 0.;
 		    dzz = 0.;
-		    if (bmask == 1) {	/* compute everything for area which is not masked out */
+		    /* compute everything for area which is not masked out
+		       and where cross_input map doesn't have nulls */
+		    if (bmask == 1 && !(cell && Rast_is_f_null_value(&cell[l - 1]))) {
 			h = b[n1];
 			hcell = b[n1];
 			for (m = 1; m <= n_points; m++) {