Changeset 833

Timestamp:

08/17/08 02:23:21 (4 months ago)

Author:

hobu

Message:

add option to allow the skipping of printing VLRs #69

Location:

trunk/apps

Files:

• las2las.c (modified) (1 diff)
• lascommon.c (modified) (2 diffs)
• lasinfo.c (modified) (4 diffs)
• lasmerge.c (modified) (4 diffs)

trunk/apps/las2las.c

@@ -23 +23 @@
 void print_point_summary(LASPointSummary* summary, LASHeaderH header);
 void print_point(LASPointH point);
-void print_header(LASHeaderH header, const char* file_name);
+void print_header(LASHeaderH header, const char* file_name, int bSkipVLR);
 void repair_header(LASHeaderH header, LASPointSummary* summary) ;
 

trunk/apps/lascommon.c

@@ -332 +332 @@
 
 
-void print_header(LASHeaderH header, const char* file_name) {
+void print_header(LASHeaderH header, const char* file_name, int bSkipVLR) {
 
     char *pszSignature = NULL;
@@ -440 +440 @@
                     pszProj4);
 
-    if (nVLR) {
+    if (nVLR && !bSkipVLR) {
         
     fprintf(stderr, "\n---------------------------------------------------------\n");

trunk/apps/lasinfo.c

@@ -27 +27 @@
 LASPointSummary* SummarizePoints(LASReaderH reader);
 void print_point_summary(LASPointSummary* summary, LASHeaderH header);
-void print_header(LASHeaderH header, const char* file_name);
+void print_header(LASHeaderH header, const char* file_name, int bSkipVLR);
 
 void usage()
@@ -85 +85 @@
     int use_stdin = FALSE;
     int update_return_counts = FALSE;
+    int skip_vlr = FALSE;
 
 
@@ -196 +197 @@
             change_header = TRUE;
         }
-                      
+        else if (   strcmp(argv[i],"--skip_vlr") == 0   ||
+                    strcmp(argv[i],"--no_vlr") == 0)
+        {
+            skip_vlr = TRUE;
+        }            
         else if (i == argc - 1 && file_name == NULL)
         {
@@ -233 +238 @@
     
     
-    print_header(header, file_name);
+    print_header(header, file_name, skip_vlr);
     
     if (change_header) {

trunk/apps/lasmerge.c

@@ -22 +22 @@
 LASPointSummary* SummarizePoints(LASReaderH reader);
 void print_point_summary(LASPointSummary* summary, LASHeaderH header);
-void print_header(LASHeaderH header, const char* file_name);
+void print_header(LASHeaderH header, const char* file_name, int bSkipVLR);
 
 void usage()
@@ -76 +76 @@
     int i;
     int verbose = FALSE;
+    int skip_vlr = FALSE;
     int num_file_name_in = 0;
     int alloced_file_name_in = 32;
@@ -181 +182 @@
             file_name_out = "stdout";
         }
-
+        else if (   strcmp(argv[i],"--skip_vlr") == 0   ||
+                    strcmp(argv[i],"--no_vlr") == 0)
+        {
+            skip_vlr = TRUE;
+        } 
         else if (i == argc - 2 && num_file_name_in == 0 && file_name_out == 0)
         {
@@ -490 +495 @@
         } 
 
-        print_header(header, file_name_out);        
+        print_header(header, file_name_out, skip_vlr);        
         summary = SummarizePoints(reader);
         print_point_summary(summary, header);