[GRASS-SVN] r62056 - in grass/branches/releasebranch_7_0: raster/r.in.lidar vector/v.in.lidar

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-09-23 08:37:48 -0700 (Tue, 23 Sep 2014)
New Revision: 62056

Modified:
   grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c
   grass/branches/releasebranch_7_0/vector/v.in.lidar/main.c
Log:
r/v.in.lidar: fix first return filter (merge from trunk, r62055)

Modified: grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c	2014-09-23 15:27:28 UTC (rev 62055)
+++ grass/branches/releasebranch_7_0/raster/r.in.lidar/main.c	2014-09-23 15:37:48 UTC (rev 62056)
@@ -788,23 +788,21 @@
 	    int n_returns = LASPoint_GetNumberOfReturns(LAS_point);
 	    skipme = 1;
 
-	    if (n_returns > 1) {
-
-		switch (return_filter) {
-		case LAS_FIRST:
-		    if (return_no == 1)
-			skipme = 0;
-		    break;
-		case LAS_LAST:
-		    if (return_no == n_returns)
-			skipme = 0;
-		    break;
-		case LAS_MID:
-		    if (return_no > 1 && return_no < n_returns)
-			skipme = 0;
-		    break;
-		}
+	    switch (return_filter) {
+	    case LAS_FIRST:
+		if (return_no == 1)
+		    skipme = 0;
+		break;
+	    case LAS_MID:
+		if (return_no > 1 && return_no < n_returns)
+		    skipme = 0;
+		break;
+	    case LAS_LAST:
+		if (n_returns > 1 && return_no == n_returns)
+		    skipme = 0;
+		break;
 	    }
+
 	    if (skipme) {
 		n_filtered++;
 		continue;

Modified: grass/branches/releasebranch_7_0/vector/v.in.lidar/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.in.lidar/main.c	2014-09-23 15:27:28 UTC (rev 62055)
+++ grass/branches/releasebranch_7_0/vector/v.in.lidar/main.c	2014-09-23 15:37:48 UTC (rev 62056)
@@ -668,23 +668,21 @@
 	    int n_returns = LASPoint_GetNumberOfReturns(LAS_point);
 	    skipme = 1;
 
-	    if (n_returns > 1) {
-
-		switch (return_filter) {
-		case LAS_FIRST:
-		    if (return_no == 1)
-			skipme = 0;
-		    break;
-		case LAS_LAST:
-		    if (return_no == n_returns)
-			skipme = 0;
-		    break;
-		case LAS_MID:
-		    if (return_no > 1 && return_no < n_returns)
-			skipme = 0;
-		    break;
-		}
+	    switch (return_filter) {
+	    case LAS_FIRST:
+		if (return_no == 1)
+		    skipme = 0;
+		break;
+	    case LAS_MID:
+		if (return_no > 1 && return_no < n_returns)
+		    skipme = 0;
+		break;
+	    case LAS_LAST:
+		if (n_returns > 1 && return_no == n_returns)
+		    skipme = 0;
+		break;
 	    }
+	    
 	    if (skipme) {
 		n_filtered++;
 		continue;