[Liblas-commits] laszip: 2 new changesets

liblas-commits at liblas.org liblas-commits at liblas.org
Tue Jan 19 12:55:37 EST 2010


changeset e31d088e1cf4 in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=e31d088e1cf4
summary: use tabs instead of spaces in makefiles

changeset cfa49ef4b213 in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=cfa49ef4b213
summary: merging

diffstat:

 src/Makefile.am       |   16 +-
 tools/src/Makefile.am |    6 +
 tools/src/laszip.cpp  |  446 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 460 insertions(+), 8 deletions(-)

diffs (truncated from 485 to 300 lines):

diff -r ba3b839989fd -r cfa49ef4b213 src/Makefile.am
--- a/src/Makefile.am	Tue Jan 19 11:45:27 2010 -0600
+++ b/src/Makefile.am	Tue Jan 19 11:50:33 2010 -0600
@@ -19,13 +19,13 @@
 						arithmeticdecoder.cpp \
 						arithmeticencoder.cpp \
 						arithmeticintegercompressor.cpp \
-                                                laspointreader0compressedarithmetic.cpp \
-                                                laspointreader1compressedarithmetic.cpp \
-                                                laspointreader2compressedarithmetic.cpp \
-                                                laspointreader3compressedarithmetic.cpp \
-                                                laspointwriter0compressedarithmetic.cpp \
-                                                laspointwriter1compressedarithmetic.cpp \
-                                                laspointwriter2compressedarithmetic.cpp \
-                                                laspointwriter3compressedarithmetic.cpp \
+						laspointreader0compressedarithmetic.cpp \
+						laspointreader1compressedarithmetic.cpp \
+						laspointreader2compressedarithmetic.cpp \
+						laspointreader3compressedarithmetic.cpp \
+						laspointwriter0compressedarithmetic.cpp \
+						laspointwriter1compressedarithmetic.cpp \
+						laspointwriter2compressedarithmetic.cpp \
+						laspointwriter3compressedarithmetic.cpp \
 						lasreader.cpp \
 						laswriter.cpp
diff -r ba3b839989fd -r cfa49ef4b213 tools/src/Makefile.am
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/src/Makefile.am	Tue Jan 19 11:50:33 2010 -0600
@@ -0,0 +1,6 @@
+SUBDIRS = . 
+
+AM_CPPFLAGS = -I../../include
+noinst_LTLIBRARIES = liblibrary.la 
+
+laszip_SOURCES =			laszip.cpp
diff -r ba3b839989fd -r cfa49ef4b213 tools/src/laszip.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/src/laszip.cpp	Tue Jan 19 11:50:33 2010 -0600
@@ -0,0 +1,446 @@
+/*
+===============================================================================
+
+  FILE:  laszip.cpp
+  
+  CONTENTS:
+  
+    This tool reads and writes LIDAR data in the LAS format. Because our reader
+    and writer for the LAS format also support compression we can use this tool
+    to compress or decompress LIDAR files from standard *.las to our *.las.lz 
+    or *.laz format.
+
+  PROGRAMMERS:
+  
+    martin isenburg at cs.unc.edu
+  
+  COPYRIGHT:
+  
+    copyright (C) 2007-08 martin isenburg at cs.unc.edu
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+  CHANGE HISTORY:
+  
+    12 March 2009 -- updated to ask for input if started without arguments 
+    17 September 2008 -- updated to deal with LAS format version 1.2
+    14 February 2007 -- created after picking flowers for the Valentine dinner
+  
+===============================================================================
+*/
+
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lasreader.h"
+#include "laswriter.h"
+
+#ifdef _WIN32
+extern "C" FILE* fopenGzipped(const char* filename, const char* mode);
+#endif
+
+void usage(bool wait=false)
+{
+  fprintf(stderr,"usage:\n");
+  fprintf(stderr,"laszip lidar.las\n");
+  fprintf(stderr,"laszip lidar.laz\n");
+  fprintf(stderr,"laszip lidar.las lidar.las.lz\n");
+  fprintf(stderr,"laszip lidar.las.lz\n");
+  fprintf(stderr,"laszip -i lidar.las -o lidar_compressed.laz\n");
+  fprintf(stderr,"laszip -i lidar.las -olaz > lidar_compressed.laz\n");
+  fprintf(stderr,"laszip -h\n");
+  if (wait)
+  {
+    fprintf(stderr,"<press ENTER>\n");
+    getc(stdin);
+  }
+  exit(1);
+}
+
+static void byebye(bool wait=false)
+{
+  if (wait)
+  {
+    fprintf(stderr,"<press ENTER>\n");
+    getc(stdin);
+  }
+  exit(1);
+}
+
+static double taketime()
+{
+  return (double)(clock())/CLOCKS_PER_SEC;
+}
+
+int main(int argc, char *argv[])
+{
+  int i;
+  bool dry = false;
+  bool verbose = false;
+  char* file_name_in = 0;
+  char* file_name_out = 0;
+  bool ilas = false;
+  bool ilaz = false;
+  bool olas = false;
+  bool olaz = false;
+  bool range = true;
+  double start_time = 0;
+
+  if (argc == 1)
+  {
+    fprintf(stderr,"laszip.exe is better run in the command line\n");
+    file_name_in = new char[256];
+    fprintf(stderr,"enter input file: "); fgets(file_name_in, 256, stdin);
+    file_name_in[strlen(file_name_in)-1] = '\0';
+    file_name_out = new char[256];
+    fprintf(stderr,"enter output file: "); fgets(file_name_out, 256, stdin);
+    file_name_out[strlen(file_name_out)-1] = '\0';
+  }
+
+  for (i = 1; i < argc; i++)
+  {
+    if (strcmp(argv[i],"-dry") == 0)
+    {
+      dry = true;
+    }
+    else if (strcmp(argv[i],"-verbose") == 0)
+    {
+      verbose = true;
+    }
+    else if (strcmp(argv[i],"-range") == 0)
+    {
+      range = true;
+    }
+    else if (strcmp(argv[i],"-arithmetic") == 0 || strcmp(argv[i],"-arith") == 0)
+    {
+      range = false;
+    }
+    else if (strcmp(argv[i],"-h") == 0)
+    {
+      usage();
+    }
+    else if (strcmp(argv[i],"-i") == 0)
+    {
+      i++;
+      file_name_in = argv[i];
+    }
+    else if (strcmp(argv[i],"-o") == 0)
+    {
+      i++;
+      file_name_out = argv[i];
+    }
+    else if (strcmp(argv[i],"-ilas") == 0)
+    {
+      ilas = true;
+    }
+    else if (strcmp(argv[i],"-ilaz") == 0)
+    {
+      ilaz = true;
+    }
+    else if (strcmp(argv[i],"-olas") == 0)
+    {
+      olas = true;
+    }
+    else if (strcmp(argv[i],"-olaz") == 0)
+    {
+      olaz = true;
+    }
+    else if (i == argc - 2 && 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 != 0 && file_name_out == 0)
+    {
+      file_name_out = argv[i];
+    }
+    else
+    {
+      fprintf(stderr,"cannot understand argument '%s'\n", argv[i]);
+      usage();
+    }
+  }
+
+  // open input file
+
+  FILE* file_in = 0;
+  if (file_name_in)
+  {
+    if (strstr(file_name_in, ".gz"))
+    {
+#ifdef _WIN32
+      file_in = fopenGzipped(file_name_in, "rb");
+#else
+      fprintf(stderr, "ERROR: no support for gzipped input\n");
+      byebye(argc==1);
+#endif
+    }
+    else
+    {
+      file_in = fopen(file_name_in, "rb");
+    }
+    if (file_in == 0)
+    {
+      fprintf(stderr, "ERROR: could not open '%s'\n",file_name_in);
+      byebye(argc==1);
+    }
+  }
+  else if (ilas || ilaz)
+  {
+    file_in = stdin;
+  }
+  else
+  {
+    fprintf(stderr, "ERROR: no input specified\n");
+    usage(argc==1);
+  }
+
+  LASreader* lasreader = new LASreader();
+
+  if (!lasreader->open(file_in))
+  {
+    fprintf(stderr, "ERROR: could not open lasreader\n");
+    byebye(argc==1);
+  }
+
+  // maybe only a read pass
+
+  if (dry)
+  {
+    LASpoint point_min;
+    LASpoint point_max;
+    double gps_time_min = 0;
+    double gps_time_max = 0;
+    short rgb_min[3] = {0,0,0};
+    short rgb_max[3] = {0,0,0};
+
+    start_time = taketime();
+
+    if (verbose)
+    {
+      lasreader->read_point();
+      point_min = lasreader->point;
+      point_max = lasreader->point;
+      if (lasreader->points_have_gps_time)
+      {
+        gps_time_min = lasreader->gps_time;
+        gps_time_max = lasreader->gps_time;
+      }
+      if (lasreader->points_have_rgb)
+      {
+        rgb_min[0] = lasreader->rgb[0];
+        rgb_min[1] = lasreader->rgb[1];
+        rgb_min[2] = lasreader->rgb[2];
+        rgb_max[0] = lasreader->rgb[0];
+        rgb_max[1] = lasreader->rgb[1];
+        rgb_max[2] = lasreader->rgb[2];
+      }
+      while (lasreader->read_point())
+      {
+        if (lasreader->point.x < point_min.x) point_min.x = lasreader->point.x;
+        else if (lasreader->point.x > point_max.x) point_max.x = lasreader->point.x;
+        if (lasreader->point.y < point_min.y) point_min.y = lasreader->point.y;
+        else if (lasreader->point.y > point_max.y) point_max.y = lasreader->point.y;
+        if (lasreader->point.z < point_min.z) point_min.z = lasreader->point.z;
+        else if (lasreader->point.z > point_max.z) point_max.z = lasreader->point.z;
+        if (lasreader->point.intensity < point_min.intensity) point_min.intensity = lasreader->point.intensity;
+        else if (lasreader->point.intensity > point_max.intensity) point_max.intensity = lasreader->point.intensity;
+        if (lasreader->point.edge_of_flight_line < point_min.edge_of_flight_line) point_min.edge_of_flight_line = lasreader->point.edge_of_flight_line;
+        else if (lasreader->point.edge_of_flight_line > point_max.edge_of_flight_line) point_max.edge_of_flight_line = lasreader->point.edge_of_flight_line;
+        if (lasreader->point.scan_direction_flag < point_min.scan_direction_flag) point_min.scan_direction_flag = lasreader->point.scan_direction_flag;
+        else if (lasreader->point.scan_direction_flag > point_max.scan_direction_flag) point_max.scan_direction_flag = lasreader->point.scan_direction_flag;
+        if (lasreader->point.number_of_returns_of_given_pulse < point_min.number_of_returns_of_given_pulse) point_min.number_of_returns_of_given_pulse = lasreader->point.number_of_returns_of_given_pulse;
+        else if (lasreader->point.number_of_returns_of_given_pulse > point_max.number_of_returns_of_given_pulse) point_max.number_of_returns_of_given_pulse = lasreader->point.number_of_returns_of_given_pulse;
+        if (lasreader->point.return_number < point_min.return_number) point_min.return_number = lasreader->point.return_number;


More information about the Liblas-commits mailing list