[Liblas-commits] r1320 - trunk/apps

[liblas-commits at liblas.org]

Author: hobu
Date: Mon Jul 27 13:15:25 2009
New Revision: 1320
URL: http://liblas.org/changeset/1320

Log:
forwardport r1319 to fix #144

Modified:
   trunk/apps/las2las.c
   trunk/apps/las2txt.c
   trunk/apps/txt2las.c

Modified: trunk/apps/las2las.c
==============================================================================
--- trunk/apps/las2las.c	(original)
+++ trunk/apps/las2las.c	Mon Jul 27 13:15:25 2009
@@ -274,15 +274,11 @@
         {
             remove_extra_header = TRUE;
         }
-        else if (i == argc - 2 && file_name_in == NULL && file_name_out == NULL)
+        else if (file_name_in == NULL && file_name_out == NULL)
         {
             file_name_in = argv[i];
         }
-        else if (i == argc - 1 && file_name_in == NULL && file_name_out == NULL)
-        {
-            file_name_in = argv[i];
-        }
-        else if (i == argc - 1 && file_name_in != NULL && file_name_out == NULL)
+        else if (file_name_in != NULL && file_name_out == NULL)
         {
             file_name_out = argv[i];
         }

Modified: trunk/apps/las2txt.c
==============================================================================
--- trunk/apps/las2txt.c	(original)
+++ trunk/apps/las2txt.c	Mon Jul 27 13:15:25 2009
@@ -266,15 +266,11 @@
             i++;
             file_name_out = argv[i];
         }
-        else if (i == argc - 2 && file_name_in == 0 && file_name_out == 0)
+        else if (file_name_in == 0 && file_name_out == 0)
         {
             file_name_in = argv[i];
         }
-        else if (i == argc - 1 && file_name_in == 0 && file_name_out == 0)
-        {
-            file_name_in = argv[i];
-        }
-        else if (i == argc - 1 && file_name_in && file_name_out == 0)
+        else if (file_name_in && file_name_out == 0)
         {
             file_name_out = argv[i];
         }

Modified: trunk/apps/txt2las.c
==============================================================================
--- trunk/apps/txt2las.c	(original)
+++ trunk/apps/txt2las.c	Mon Jul 27 13:15:25 2009
@@ -512,22 +512,13 @@
             i++;
             file_creation_year = (unsigned short)atoi(argv[i]);
         }
-        else if (   i == argc - 2 
-                    && file_name_in == NULL && 
+        else if (   file_name_in == NULL && 
                     file_name_out == NULL
                 )
         {
             file_name_in = argv[i];
         }
-        else if (   i == argc - 1 && 
-                    file_name_in == NULL && 
-                    file_name_out == NULL
-                )
-        {
-            file_name_in = argv[i];
-        }
-        else if (   i == argc - 1 && 
-                    file_name_in && 
+        else if (   file_name_in && 
                     file_name_out == NULL
                 )
         {