Pārlūkot izejas kodu

v.vol.rst: do not ignore null values in cross_input, causes serious slow down on Windows

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@64783 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 10 gadi atpakaļ
vecāks
revīzija
86b0d6aeec
1 mainītis faili ar 3 papildinājumiem un 1 dzēšanām
  1. 3 1
      vector/v.vol.rst/user3.c

+ 3 - 1
vector/v.vol.rst/user3.c

@@ -443,7 +443,9 @@ COGRR1(double x_or, double y_or, double z_or, int n_rows, int n_cols,
 		    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++) {