[GRASS-SVN] r54144 - grass/trunk/raster/r.in.lidar

[svn_grass at osgeo.org]

Author: mmetz
Date: 2012-12-02 11:41:18 -0800 (Sun, 02 Dec 2012)
New Revision: 54144

Modified:
   grass/trunk/raster/r.in.lidar/main.c
Log:
r.in.lidar: fix spatial filter

Modified: grass/trunk/raster/r.in.lidar/main.c
===================================================================
--- grass/trunk/raster/r.in.lidar/main.c	2012-12-02 19:34:29 UTC (rev 54143)
+++ grass/trunk/raster/r.in.lidar/main.c	2012-12-02 19:41:18 UTC (rev 54144)
@@ -680,7 +680,7 @@
 	    if (y <= pass_south || y > pass_north) {
 		continue;
 	    }
-	    if (x < region.west || x > region.east) {
+	    if (x < region.west || x >= region.east) {
 		continue;
 	    }
 
@@ -699,29 +699,6 @@
 	    arr_row = (int)((pass_north - y) / region.ns_res);
 	    arr_col = (int)((x - region.west) / region.ew_res);
 
-	    /*          G_debug(5, "arr_row: %d   arr_col: %d", arr_row, arr_col); */
-
-	    /* The range should be [0,cols-1]. We use (int) to round down,
-	       but if the point exactly on eastern edge arr_col will be /just/
-	       on the max edge .0000000 and end up on the next row.
-	       We could make above bounds check "if(x>=region.east) continue;"
-	       But instead we go to all sorts of trouble so that not one single
-	       data point is lost. GE is too small to catch them all.
-	       We don't try to make y happy as percent segmenting will make some
-	       points happen twice that way; so instead we use the y<= test above.
-	     */
-	    if (arr_col >= cols) {
-		if (((x - region.west) / region.ew_res) - cols <
-		    10 * GRASS_EPSILON)
-		    arr_col--;
-		else {		/* oh well, we tried. */
-		    G_debug(3,
-			    "skipping extraneous data point [%.3f], column %d of %d",
-			    x, arr_col, cols);
-		    continue;
-		}
-	    }
-
 	    if (bin_n)
 		update_n(n_array, cols, arr_row, arr_col);
 	    if (bin_min)