Changeset 528

Timestamp:

03/07/08 14:42:54 (16 months ago)

Author:

hobu

Message:

fix some dumb stuf in las2las

Files:

• trunk/apps/las2las.c (modified) (11 diffs)

trunk/apps/las2las.c

@@ -78 +78 @@
     char* file_name_in = 0;
     char* file_name_out = 0;
-    int clip_xy_min[2];
-    int clip_xy_max[2];
+    double *clip_xy_min = NULL;
+    double *clip_xy_max = NULL;
     int clip = FALSE;
     int remove_extra_header = FALSE;
@@ -156 +156 @@
                 )
         {
-            i++;
-            clip_xy_min[0] = atoi(argv[i]);
-            i++;
-            clip_xy_min[1] = atoi(argv[i]);
-            i++;
-            clip_xy_max[0] = atoi(argv[i]);
-            i++;
-            clip_xy_max[1] = atoi(argv[i]);
+            clip_xy_min = (double*) malloc (2 * sizeof(double));
+            clip_xy_max = (double*) malloc( 2 * sizeof(double));
+            i++;
+            clip_xy_min[0] = atof(argv[i]);
+            i++;
+            clip_xy_min[1] = atof(argv[i]);
+            i++;
+            clip_xy_max[0] = atof(argv[i]);
+            i++;
+            clip_xy_max[1] = atof(argv[i]);
             clip = TRUE;
         }
@@ -553 +555 @@
 
     if (use_stdout) file_name_out = "stdout";
-    writer = LASWriter_Create(file_name_out, surviving_header, LAS_MODE_APPEND);
+    writer = LASWriter_Create(file_name_out, surviving_header, LAS_MODE_WRITE);
     if (!writer) { 
         LASError_Print("Could not open file to write");
@@ -570 +572 @@
 */
 
+  LASReader_Destroy(reader);
+  reader = NULL;
+  if (file_name_in)
+  {
+      reader = LASReader_Create(file_name_in);
+    if (!reader) { 
+        LASError_Print("Could not open file to read");
+        exit(1);
+    } 
+  }
+  else
+  {
+      LASError_Print("no input specified");
+      usage();
+      exit(1);
+  }
 
     p = LASReader_GetNextPoint(reader);
@@ -581 +599 @@
     
     while (p) {
+        printf("fetching...");
 
         if (last_only && LASPoint_GetReturnNumber(p) != LASPoint_GetNumberOfReturns(p))
         {
+            printf("last_only...");
             p = LASReader_GetNextPoint(reader);
             continue;
@@ -589 +609 @@
         if (first_only && LASPoint_GetReturnNumber(p) != 1)
         {
+            printf("first_only...");
             p = LASReader_GetNextPoint(reader);
             continue;
@@ -595 +616 @@
         if (clip_xy_min && (LASPoint_GetX(p) < clip_xy_min[0] || LASPoint_GetY(p) < clip_xy_min[1]))
         {
+            printf("clip_xy_min...");
             p = LASReader_GetNextPoint(reader);
             continue;
@@ -600 +622 @@
         if (clip_xy_max && (LASPoint_GetX(p) > clip_xy_max[0] || LASPoint_GetY(p) > clip_xy_max[1]))
         {
+            printf("\nclip_xy_max...");
+            printf("LASPoint_GetX(p): %.2f ", LASPoint_GetX(p));
+            printf("clip_xy_max[0] %.2f ", clip_xy_max[0]);
+            printf("clip_xy_max[1] %.2f\n ", clip_xy_max[1]);
             p = LASReader_GetNextPoint(reader);
             continue;
@@ -605 +631 @@
         if (elim_return && (elim_return & (1 << LASPoint_GetReturnNumber(p))))
         {
+            printf("elim_return...");
             p = LASReader_GetNextPoint(reader);
             continue;
@@ -610 +637 @@
         if (elim_scan_angle_above && (LASPoint_GetScanAngleRank(p) > elim_scan_angle_above || LASPoint_GetScanAngleRank(p) < -elim_scan_angle_above))
         {
+            printf("elim_scan_anble...");
             p = LASReader_GetNextPoint(reader);
             continue;
@@ -615 +643 @@
         if (elim_intensity_below && LASPoint_GetIntensity(p) < elim_intensity_below)
         {
+            printf("elim_intensity...");
             p = LASReader_GetNextPoint(reader);
             continue;
         }
         LASWriter_WritePoint(writer,p);
+        printf("Writing point...");
 
         p  = LASReader_GetNextPoint(reader);