[Liblas-commits] hg: Remove unused argument.
liblas-commits at liblas.org
liblas-commits at liblas.org
Thu Jul 21 14:17:17 EDT 2011
details: http://hg.liblas.orghg/rev/294b1f02dee0
changeset: 3076:294b1f02dee0
user: Andrew Bell <andrew.bell.ia at gmail.com>
date: Fri Jun 24 14:18:24 2011 -0500
description:
Remove unused argument.
Subject: hg: Remove unused file.
details: http://hg.liblas.orghg/rev/c77f781384b5
changeset: 3077:c77f781384b5
user: Andrew Bell <andrew.bell.ia at gmail.com>
date: Fri Jun 24 14:23:40 2011 -0500
description:
Remove unused file.
Subject: hg: merge
details: http://hg.liblas.orghg/rev/de20a786bb5d
changeset: 3078:de20a786bb5d
user: Andrew Bell <andrew.bell.ia at gmail.com>
date: Fri Jun 24 14:24:24 2011 -0500
description:
merge
Subject: hg: merge
details: http://hg.liblas.orghg/rev/5e62243aab2b
changeset: 3079:5e62243aab2b
user: Andrew Bell <andrew.bell.ia at gmail.com>
date: Thu Jul 21 13:15:26 2011 -0500
description:
merge
diffstat:
.hgignore | 231 ++++++++++----------
.hgtags | 1 +
CMakeLists.txt | 64 +----
apps/kdx_util.cpp | 10 +-
apps/las2txt.cpp | 22 +-
apps/lasindex_test.cpp | 1 +
apps/liblas-config.in | 2 +-
cmake/modules/FindLASzip.cmake | 2 -
doc/download.txt | 37 ++-
include/liblas/capi/las_version.h | 6 +-
include/liblas/capi/liblas.h | 16 +
include/liblas/detail/opt_allocator.hpp | 10 +-
include/liblas/detail/reader/zipreader.hpp | 8 +-
include/liblas/detail/rt_allocator.hpp | 153 -------------
include/liblas/detail/writer/zipwriter.hpp | 8 +-
include/liblas/detail/zippoint.hpp | 17 +-
include/liblas/header.hpp | 12 +
mpg-config.bat | 27 ++
python/liblas/core.py | 32 +-
python/liblas/file.py | 17 +-
python/liblas/header.py | 15 +
python/liblas/point.py | 72 +-----
python/setup.py | 2 +-
python/tests/File.txt | 26 +-
python/tests/Header.txt | 7 +-
python/tests/SRS-GDAL.txt | 6 +-
src/c_api.cpp | 58 +++++-
src/detail/reader/header.cpp | 19 +-
src/detail/reader/zipreader.cpp | 127 +++--------
src/detail/writer/header.cpp | 107 +++++----
src/detail/writer/zipwriter.cpp | 133 ++++--------
src/detail/zippoint.cpp | 197 +++++++----------
src/header.cpp | 86 ++++++-
src/spatialreference.cpp | 5 +-
src/transform.cpp | 7 +-
src/variablerecord.cpp | 2 +
test/data/1.2-with-color.laz | 0
test/unit/common.cpp | 7 +-
test/unit/reader_iterator_test.cpp | 6 +
test/unit/spatialreference_test.cpp | 6 +-
test/unit/zipwriter_test.cpp | 317 ++++++++++++++++++++++++++++-
41 files changed, 1045 insertions(+), 836 deletions(-)
diffs (truncated from 2897 to 300 lines):
diff -r 6bb00e9076ce -r 5e62243aab2b .hgignore
--- a/.hgignore Wed Jun 22 11:22:19 2011 -0500
+++ b/.hgignore Thu Jul 21 13:15:26 2011 -0500
@@ -1,115 +1,116 @@
-syntax: glob
-*~
-\#*\#
-.\#*
-*.bak
-*.dll
-*.dll.manifest
-*.embed.manifest
-*.exe
-*.exe.manifest
-*.exp
-*.idb
-*.ilk
-*.intermediate.manifest
-*.la
-*.lib
-*.lo
-*.ncb
-*.o
-*.obj
-*.orig
-*.pdb
-*.pyc
-*.res
-*.suo
-*.swp
-*.user
-*.vcproj
-*.sln
-.deps
-./bin
-.DS_Store
-.libs
-aclocal.m4
-apps/las2las
-apps/las2oci
-apps/las2ogr
-apps/las2txt
-apps/lasindex
-apps/lasinfo
-apps/lasmerge
-apps/liblas-config
-apps/ts2las
-apps/txt2las
-autom4te.cache
-build.hobu
-cmake_install.cmake
-CMakeCache.txt
-CMakeFiles
-CTestTestfile.cmake
-CPackConfig.cmake
-CPackSourceConfig.cmake
-buildout/setenv
-install_manifest.txt
-_CPack_Packages/
-src/CMakeFiles
-config.guess
-config.log
-config.status
-config.sub
-configure
-Debug
-depcomp
-install-sh
-liblas_test
-libtool
-ltmain.sh
-Makefile
-Makefile.in
-missing
-python/build/*
-python/dist/*
-python/libLAS.egg-info/*
-Release
-src/liblas.a
-test/data/*.dat
-test/data/*.idx
-.dirstamp
-*.dir
-CMakeScripts
-libLAS.xcodeproj
-build/libLAS.build
-buildout/source
-buildout/share
-buildout/lib
-buildout/include
-buildout/bin
-buildout/eggs
-buildout/parts
-buildout/develop-eggs
-buildout/doc
-buildout/man
-doc/build
-doc/api/xml
-doc/api/html
-*.mshark
-Testing/
-README.txt
-osgeo4w/
-test/data/Autzen_Stadium/
-DartConfiguration.tcl
-
-# stuff generated by VS2010
-*.ipch
-*.vcxproj
-*.vcxproj.filters
-libLAS.opensdf
-libLAS.sdf
-*.tlog
-csharp-new/liblas_swig.opensdf
-csharp-new/liblas_swig.sdf
-
-# swig-generated files
-csharp-new/liblas_swig_cs/*.cs
-csharp-new/liblas_swig_cpp/liblas_wrap.cpp
+syntax: glob
+*~
+\#*\#
+.\#*
+*.bak
+*.dll
+*.dll.manifest
+*.embed.manifest
+*.exe
+*.exe.manifest
+*.exp
+*.idb
+*.ilk
+*.intermediate.manifest
+*.la
+*.lib
+*.lo
+*.ncb
+*.o
+*.obj
+*.orig
+*.pdb
+*.pyc
+*.res
+*.suo
+*.swp
+*.user
+*.vcproj
+*.sln
+*.sln.docstates
+.deps
+./bin
+.DS_Store
+.libs
+aclocal.m4
+apps/las2las
+apps/las2oci
+apps/las2ogr
+apps/las2txt
+apps/lasindex
+apps/lasinfo
+apps/lasmerge
+apps/liblas-config
+apps/ts2las
+apps/txt2las
+autom4te.cache
+build.hobu
+cmake_install.cmake
+CMakeCache.txt
+CMakeFiles
+CTestTestfile.cmake
+CPackConfig.cmake
+CPackSourceConfig.cmake
+buildout/setenv
+install_manifest.txt
+_CPack_Packages/
+src/CMakeFiles
+config.guess
+config.log
+config.status
+config.sub
+configure
+Debug
+depcomp
+install-sh
+liblas_test
+libtool
+ltmain.sh
+Makefile
+Makefile.in
+missing
+python/build/*
+python/dist/*
+python/libLAS.egg-info/*
+Release
+src/liblas.a
+test/data/*.dat
+test/data/*.idx
+.dirstamp
+*.dir
+CMakeScripts
+libLAS.xcodeproj
+build/libLAS.build
+buildout/source
+buildout/share
+buildout/lib
+buildout/include
+buildout/bin
+buildout/eggs
+buildout/parts
+buildout/develop-eggs
+buildout/doc
+buildout/man
+doc/build
+doc/api/xml
+doc/api/html
+*.mshark
+Testing/
+README.txt
+osgeo4w/
+test/data/Autzen_Stadium/
+DartConfiguration.tcl
+
+# stuff generated by VS2010
+*.ipch
+*.vcxproj
+*.vcxproj.filters
+libLAS.opensdf
+libLAS.sdf
+*.tlog
+csharp-new/liblas_swig.opensdf
+csharp-new/liblas_swig.sdf
+
+# swig-generated files
+csharp-new/liblas_swig_cs/*.cs
+csharp-new/liblas_swig_cpp/liblas_wrap.cpp
diff -r 6bb00e9076ce -r 5e62243aab2b .hgtags
--- a/.hgtags Wed Jun 22 11:22:19 2011 -0500
+++ b/.hgtags Thu Jul 21 13:15:26 2011 -0500
@@ -14,3 +14,4 @@
e4baaf6287a20b01e0fbe3632a37c3c559ca9ca2 0.9.6
f93c63e4384fd4ad3fae69b72db3643455539919 1.0.1
d1bf7693076ccd8245bd98acea9a1a10553be066 1.6.0
+58c409e18a5323f60a0f1c6afb5738ae4256a364 1.7.0b2
diff -r 6bb00e9076ce -r 5e62243aab2b CMakeLists.txt
--- a/CMakeLists.txt Wed Jun 22 11:22:19 2011 -0500
+++ b/CMakeLists.txt Thu Jul 21 13:15:26 2011 -0500
@@ -11,7 +11,7 @@
SET(LIBLAS_VERSION_MAJOR "1")
SET(LIBLAS_VERSION_MINOR "7")
-SET(LIBLAS_VERSION_PATCH "0")
+SET(LIBLAS_VERSION_PATCH "0b2")
set(VERSION "${LIBLAS_VERSION_MAJOR}.${LIBLAS_VERSION_MINOR}.${LIBLAS_VERSION_PATCH}")
SET(LIBLAS_LIB_SOVERSION "2.0.0")
SET(LIBLAS_C_LIB_SOVERSION "2.0.0")
@@ -83,7 +83,7 @@
if(NOT MSVC_IDE)
if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE Debug CACHE STRING
+ set(CMAKE_BUILD_TYPE Release CACHE STRING
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
endif()
message(STATUS "Setting libLAS build type - ${CMAKE_BUILD_TYPE}")
@@ -192,18 +192,21 @@
mark_as_advanced(CLEAR Boost_LIBRARY_DIRS)
link_directories(${Boost_LIBRARY_DIRS})
+# LASZIP support - optional, default=ON
+set(WITH_LASZIP FALSE CACHE BOOL "Choose if LASzip support should be built")
+set(WITH_STATIC_LASZIP FALSE CACHE BOOL "Choose of LASzip should be statically linked")
+mark_as_advanced(WITH_STATIC_LASZIP)
-
-# libxml2 support - optional, default=ON
-set(WITH_LIBXML2 FALSE CACHE BOOL "Choose if libxml2 support should be built ")
+if (WITH_LASZIP)
+ find_package(LASzip 2.0.1)
-if(WITH_LIBXML2)
- find_package(LibXml2)
- mark_as_advanced(CLEAR LIBXML2_INCLUDE_DIR)
- mark_as_advanced(CLEAR LIBXML2_LIBRARIES)
- if(LIBXML2_FOUND)
- include_directories(${LIBXML2_INCLUDE_DIR})
- add_definitions(-DHAVE_LIBXML2=1)
+ if(LASZIP_FOUND)
+ set(CMAKE_REQUIRED_LIBRARIES ${LASZIP_LIBRARY})
+ include_directories(${LASZIP_INCLUDE_DIR})
+ add_definitions(-DHAVE_LASZIP=1)
+ mark_as_advanced(CLEAR LASZIP_INCLUDE_DIR)
+ mark_as_advanced(CLEAR LASZIP_LIBRARY)
+ mark_as_advanced(CLEAR LASZIP_VERSION)
endif()
endif()
@@ -212,24 +215,9 @@
if(WITH_GDAL)
More information about the Liblas-commits
mailing list