[Liblas-commits] laszip: fix

[liblas-commits at liblas.org]

details:   http://hg.liblas.orglaszip/rev/78a894135583
changeset: 201:78a894135583
user:      isenburg
date:      Sun Apr 03 05:53:03 2011 -0700
description:
fix
Subject: laszip: merge

details:   http://hg.liblas.orglaszip/rev/6822cbe2b103
changeset: 202:6822cbe2b103
user:      isenburg
date:      Sun Apr 03 05:54:21 2011 -0700
description:
merge

diffstat:

 docs/source/data.rst  |  17 +++++++++++++++--
 docs/source/index.rst |   3 ++-
 src/CMakeLists.txt    |   4 ++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (81 lines):

diff -r 8b1b7bc2bfea -r 6822cbe2b103 docs/source/data.rst
--- a/docs/source/data.rst	Thu Mar 24 09:16:27 2011 -0700
+++ b/docs/source/data.rst	Sun Apr 03 05:54:21 2011 -0700
@@ -1,14 +1,26 @@
 .. _data:
 
 
-download LAZ data (compressed LAS files)
-------------------------------------------------------------------------------
+******************************************************************************
+Download LAZ data (compressed LAS)
+******************************************************************************
 
+* http://gisfiles.wm.edu/files/lidar/
 * http://gisfiles.wm.edu/files/lidar/ESLiDAR/LiDAR_ClassifiedPointCloud/
 * ftp://lidar.dnr.state.mn.us/data/raw/county/dodge/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/douglas/laz/
 * ftp://lidar.dnr.state.mn.us/data/raw/county/faribault/laz/
-* ftp://lidar.dnr.state.mn.us/data/raw/county/fillmore/laz
+* ftp://lidar.dnr.state.mn.us/data/raw/county/fillmore/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/freeborn/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/houston/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/mower/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/olmsted/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/pine/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/pope/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/steele/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/wabasha/laz/
 * ftp://lidar.dnr.state.mn.us/data/raw/county/waseca/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/winona/laz/
 * http://liblas.org/samples/
 
 .. _`OSGeo4W`: http://trac.osgeo.org/osgeo4w
diff -r 8b1b7bc2bfea -r 6822cbe2b103 docs/source/index.rst
--- a/docs/source/index.rst	Thu Mar 24 09:16:27 2011 -0700
+++ b/docs/source/index.rst	Sun Apr 03 05:54:21 2011 -0700
@@ -74,6 +74,7 @@
 * http://gisfiles.wm.edu/files/lidar/
 * http://gisfiles.wm.edu/files/lidar/ESLiDAR/LiDAR_ClassifiedPointCloud/
 * ftp://lidar.dnr.state.mn.us/data/raw/county/dodge/laz/
+* ftp://lidar.dnr.state.mn.us/data/raw/county/douglas/laz/
 * ftp://lidar.dnr.state.mn.us/data/raw/county/faribault/laz/
 * ftp://lidar.dnr.state.mn.us/data/raw/county/fillmore/laz/
 * ftp://lidar.dnr.state.mn.us/data/raw/county/freeborn/laz/
@@ -93,7 +94,7 @@
 
 * `Riegl <http://www.riegl.com/>`_
 * `TopoDOT <http://www.certainty3d.com/products/topodot/>`_
-* `Oregon Lidar Consortium <http://www.oregongeology.org/sub/projects/olc/default.htm/>`_
+* `Oregon Lidar Consortium <http://www.oregongeology.org/sub/projects/olc/default.htm>`_
 * `Minnesota Department of Natural Resources <http://www.dnr.state.mn.us/>`_
 * `US Army Corps of Engineers <http://erdc.usace.army.mil/>`_
 
diff -r 8b1b7bc2bfea -r 6822cbe2b103 src/CMakeLists.txt
--- a/src/CMakeLists.txt	Thu Mar 24 09:16:27 2011 -0700
+++ b/src/CMakeLists.txt	Sun Apr 03 05:54:21 2011 -0700
@@ -28,10 +28,12 @@
   integercompressor.hpp
   lasreaditem.hpp
   lasreaditemcompressed_v1.hpp
+  lasreaditemcompressed_v2.hpp
   lasreaditemraw.hpp
   lasreadpoint.hpp
   laswriteitem.hpp
   laswriteitemcompressed_v1.hpp
+  laswriteitemcompressed_v2.hpp
   laswriteitemraw.hpp
   laswritepoint.hpp
   mydefs.hpp
@@ -43,9 +45,11 @@
     arithmeticmodel.cpp
     integercompressor.cpp
     lasreaditemcompressed_v1.cpp
+    lasreaditemcompressed_v2.cpp
     lasreadpoint.cpp
     lasunzipper.cpp
     laswriteitemcompressed_v1.cpp
+    laswriteitemcompressed_v2.cpp
     laswritepoint.cpp
     laszip.cpp
     laszipper.cpp