[Liblas-commits] laszip: rename all header files from .h to .hpp.
Move include f...
liblas-commits at liblas.org
liblas-commits at liblas.org
Wed Dec 1 10:50:21 EST 2010
changeset 29f7d17058cc in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=29f7d17058cc
summary: rename all header files from .h to .hpp. Move include files from include/ to include/laszip. Provide CMake configuration.
diffstat:
.hgignore | 3 +
CMakeLists.txt | 96 ++++++
Makefile.am | 2 +-
cmake/laszip.vcproj.user.template | 121 +++++++
configure.ac | 5 +-
include/Makefile.am | 31 --
include/lasdefinitions.h | 258 -----------------
include/laspointreader.h | 59 ---
include/laspointreader0compressed.h | 86 -----
include/laspointreader0compressedarithmetic.h | 87 -----
include/laspointreader0raw.h | 67 ----
include/laspointreader1compressed.h | 91 -----
include/laspointreader1compressedarithmetic.h | 92 ------
include/laspointreader1raw.h | 68 ----
include/laspointreader2compressed.h | 89 -----
include/laspointreader2compressedarithmetic.h | 90 -----
include/laspointreader2raw.h | 67 ----
include/laspointreader3compressed.h | 94 ------
include/laspointreader3compressedarithmetic.h | 95 ------
include/laspointreader3raw.h | 68 ----
include/laspointwriter.h | 59 ---
include/laspointwriter0compressed.h | 86 -----
include/laspointwriter0compressedarithmetic.h | 87 -----
include/laspointwriter0raw.h | 68 ----
include/laspointwriter1compressed.h | 91 -----
include/laspointwriter1compressedarithmetic.h | 92 ------
include/laspointwriter1raw.h | 68 ----
include/laspointwriter2compressed.h | 89 -----
include/laspointwriter2compressedarithmetic.h | 90 -----
include/laspointwriter2raw.h | 68 ----
include/laspointwriter3compressed.h | 94 ------
include/laspointwriter3compressedarithmetic.h | 95 ------
include/laspointwriter3raw.h | 68 ----
include/lasreader.h | 91 -----
include/laswriter.h | 79 -----
include/laszip/Makefile.am | 31 ++
include/laszip/lasdefinitions.hpp | 258 +++++++++++++++++
include/laszip/laspointreader.hpp | 59 +++
include/laszip/laspointreader0compressed.hpp | 86 +++++
include/laszip/laspointreader0compressedarithmetic.hpp | 87 +++++
include/laszip/laspointreader0raw.hpp | 67 ++++
include/laszip/laspointreader1compressed.hpp | 91 +++++
include/laszip/laspointreader1compressedarithmetic.hpp | 92 ++++++
include/laszip/laspointreader1raw.hpp | 68 ++++
include/laszip/laspointreader2compressed.hpp | 89 +++++
include/laszip/laspointreader2compressedarithmetic.hpp | 90 +++++
include/laszip/laspointreader2raw.hpp | 67 ++++
include/laszip/laspointreader3compressed.hpp | 94 ++++++
include/laszip/laspointreader3compressedarithmetic.hpp | 95 ++++++
include/laszip/laspointreader3raw.hpp | 68 ++++
include/laszip/laspointwriter.hpp | 59 +++
include/laszip/laspointwriter0compressed.hpp | 86 +++++
include/laszip/laspointwriter0compressedarithmetic.hpp | 87 +++++
include/laszip/laspointwriter0raw.hpp | 68 ++++
include/laszip/laspointwriter1compressed.hpp | 91 +++++
include/laszip/laspointwriter1compressedarithmetic.hpp | 92 ++++++
include/laszip/laspointwriter1raw.hpp | 68 ++++
include/laszip/laspointwriter2compressed.hpp | 89 +++++
include/laszip/laspointwriter2compressedarithmetic.hpp | 90 +++++
include/laszip/laspointwriter2raw.hpp | 68 ++++
include/laszip/laspointwriter3compressed.hpp | 94 ++++++
include/laszip/laspointwriter3compressedarithmetic.hpp | 95 ++++++
include/laszip/laspointwriter3raw.hpp | 68 ++++
include/laszip/lasreader.hpp | 91 +++++
include/laszip/laswriter.hpp | 79 +++++
src/CMakeLists.txt | 98 ++++++
src/Makefile.am | 2 +-
src/arithmeticdecoder.cpp | 2 +-
src/arithmeticdecoder.h | 103 ------
src/arithmeticdecoder.hpp | 103 ++++++
src/arithmeticencoder.cpp | 2 +-
src/arithmeticencoder.h | 109 -------
src/arithmeticencoder.hpp | 109 +++++++
src/arithmeticintegercompressor.cpp | 2 +-
src/arithmeticintegercompressor.h | 135 --------
src/arithmeticintegercompressor.hpp | 135 ++++++++
src/arithmeticmodel.cpp | 2 +-
src/arithmeticmodel.h | 102 ------
src/arithmeticmodel.hpp | 102 ++++++
src/laspointreader0compressed.cpp | 2 +-
src/laspointreader0compressedarithmetic.cpp | 2 +-
src/laspointreader1compressed.cpp | 2 +-
src/laspointreader1compressedarithmetic.cpp | 2 +-
src/laspointreader2compressed.cpp | 2 +-
src/laspointreader2compressedarithmetic.cpp | 2 +-
src/laspointreader3compressed.cpp | 2 +-
src/laspointreader3compressedarithmetic.cpp | 2 +-
src/laspointwriter0compressed.cpp | 2 +-
src/laspointwriter0compressedarithmetic.cpp | 2 +-
src/laspointwriter1compressed.cpp | 2 +-
src/laspointwriter1compressedarithmetic.cpp | 2 +-
src/laspointwriter2compressed.cpp | 2 +-
src/laspointwriter2compressedarithmetic.cpp | 2 +-
src/laspointwriter3compressed.cpp | 2 +-
src/laspointwriter3compressedarithmetic.cpp | 2 +-
src/lasreader.cpp | 26 +-
src/laswriter.cpp | 26 +-
src/mydefs.h | 83 -----
src/mydefs.hpp | 83 +++++
src/rangedecoder.cpp | 2 +-
src/rangedecoder.h | 125 --------
src/rangedecoder.hpp | 125 ++++++++
src/rangeencoder.cpp | 2 +-
src/rangeencoder.h | 119 -------
src/rangeencoder.hpp | 119 +++++++
src/rangeintegercompressor.cpp | 2 +-
src/rangeintegercompressor.h | 132 --------
src/rangeintegercompressor.hpp | 132 ++++++++
src/rangemodel.cpp | 2 +-
src/rangemodel.h | 121 -------
src/rangemodel.hpp | 121 +++++++
tools/CMakeLists.txt | 57 +++
tools/Makefile.am | 2 +-
tools/lasdiff.cpp | 2 +-
tools/laszip.cpp | 4 +-
115 files changed, 4029 insertions(+), 3655 deletions(-)
diffs (truncated from 8359 to 300 lines):
diff -r ebbe9f97a0c9 -r 29f7d17058cc .hgignore
--- a/.hgignore Tue Jan 19 13:44:51 2010 -0500
+++ b/.hgignore Wed Dec 01 09:50:10 2010 -0600
@@ -1,6 +1,9 @@
syntax: glob
.deps
+install_manifest.txt
+tools/lasdiff
.libs
+bin
*~
*.dll
*.embed.manifest
diff -r ebbe9f97a0c9 -r 29f7d17058cc CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/CMakeLists.txt Wed Dec 01 09:50:10 2010 -0600
@@ -0,0 +1,96 @@
+###############################################################################
+# Main CMake configuration file for laszip
+#
+# Author: Mateusz Loskot <mateusz at loskot.net>
+#
+#
+###############################################################################
+# laszip general settings
+project(laszip)
+
+# Name of C++ library
+set(LASZIP_LIB_NAME liblaszip)
+
+
+set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
+
+###############################################################################
+# CMake settings
+cmake_minimum_required(VERSION 2.6.0)
+
+set(CMAKE_COLOR_MAKEFILE ON)
+
+# Allow advanced users to generate Makefiles printing detailed commands
+mark_as_advanced(CLEAR CMAKE_VERBOSE_MAKEFILE )
+
+# Path to additional CMake modules
+set(CMAKE_MODULE_PATH ${laszip_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+
+###############################################################################
+# General build settings
+
+# Default to release mode
+if(NOT MSVC_IDE)
+ set(CMAKE_BUILD_TYPE Release CACHE STRING
+ "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel")
+endif()
+
+# TODO: Still testing the output paths --mloskot
+set(LASZIP_BUILD_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE})
+
+# Output directory in which to build RUNTIME target files.
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LASZIP_BUILD_OUTPUT_DIRECTORY})
+
+# Output directory in which to build LIBRARY target files
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LASZIP_BUILD_OUTPUT_DIRECTORY})
+
+# Output directory in which to build ARCHIVE target files.
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LASZIP_BUILD_OUTPUT_DIRECTORY})
+
+###############################################################################
+# Installation settings
+
+if(WIN32)
+ set(DEFAULT_LIB_SUBDIR lib)
+ set(DEFAULT_DATA_SUBDIR .)
+ set(DEFAULT_INCLUDE_SUBDIR include)
+
+ if (MSVC)
+ set(DEFAULT_BIN_SUBDIR bin)
+ else()
+ set(DEFAULT_BIN_SUBDIR .)
+ endif()
+else()
+ # Common locations for Unix and Mac OS X
+ set(DEFAULT_BIN_SUBDIR bin)
+ set(DEFAULT_LIB_SUBDIR lib)
+ set(DEFAULT_INCLUDE_SUBDIR include)
+endif()
+
+# Locations are changeable by user to customize layout of laszip installation
+# (default values are platform-specific)
+set(LASZIP_BIN_SUBDIR ${DEFAULT_BIN_SUBDIR} CACHE STRING
+ "Subdirectory where executables will be installed")
+set(LASZIP_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING
+ "Subdirectory where libraries will be installed")
+set(LASZIP_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING
+ "Subdirectory where header files will be installed")
+set(LASZIP_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING
+ "Subdirectory where data will be installed")
+
+# Mark *_SUBDIR variables as advanced and dedicated to use by power-users only.
+mark_as_advanced(LASZIP_BIN_SUBDIR
+ LASZIP_LIB_SUBDIR LASZIP_INCLUDE_SUBDIR LASZIP_DATA_SUBDIR)
+
+# Full paths for the installation
+set(LASZIP_BIN_DIR ${LASZIP_BIN_SUBDIR})
+set(LASZIP_LIB_DIR ${LASZIP_LIB_SUBDIR})
+set(LASZIP_INCLUDE_DIR ${LASZIP_INCLUDE_SUBDIR})
+set(LASZIP_DATA_DIR ${LASZIP_DATA_SUBDIR})
+
+###############################################################################
+# Processing of project directories
+
+add_subdirectory(src)
+
+add_subdirectory(tools)
\ No newline at end of file
diff -r ebbe9f97a0c9 -r 29f7d17058cc Makefile.am
--- a/Makefile.am Tue Jan 19 13:44:51 2010 -0500
+++ b/Makefile.am Wed Dec 01 09:50:10 2010 -0600
@@ -1,4 +1,4 @@
-SUBDIRS = src . include tools
+SUBDIRS = src . include/laszip tools
lib_LTLIBRARIES = liblaszip.la
diff -r ebbe9f97a0c9 -r 29f7d17058cc cmake/laszip.vcproj.user.template
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cmake/laszip.vcproj.user.template Wed Dec 01 09:50:10 2010 -0600
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioUserFile
+ ProjectType="Visual C++"
+ Version="9.00"
+ ShowAllFiles="false"
+ >
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ >
+ <DebugSettings
+ Command="$(TargetPath)"
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="DEV410"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment="PATH=@VCPROJ_USER_ENVIRONMENT_PATH_DEBUG@;%PATH%"
+ EnvironmentMerge="true"
+ DebuggerFlavor="0"
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ >
+ <DebugSettings
+ Command="$(TargetPath)"
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="DEV410"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment="PATH=@VCPROJ_USER_ENVIRONMENT_PATH_DEBUG@;%PATH%"
+ EnvironmentMerge="true"
+ DebuggerFlavor="0"
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ <Configuration
+ Name="MinSizeRel|Win32"
+ >
+ <DebugSettings
+ Command="$(TargetPath)"
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="DEV410"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment="PATH=@VCPROJ_USER_ENVIRONMENT_PATH_DEBUG@;%PATH%"
+ EnvironmentMerge="true"
+ DebuggerFlavor="0"
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ <Configuration
+ Name="RelWithDebInfo|Win32"
+ >
+ <DebugSettings
+ Command="$(TargetPath)"
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="DEV410"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment="PATH=@VCPROJ_USER_ENVIRONMENT_PATH_DEBUG@;%PATH%"
+ EnvironmentMerge="true"
+ DebuggerFlavor="0"
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ </Configurations>
+</VisualStudioUserFile>
\ No newline at end of file
diff -r ebbe9f97a0c9 -r 29f7d17058cc configure.ac
--- a/configure.ac Tue Jan 19 13:44:51 2010 -0500
+++ b/configure.ac Wed Dec 01 09:50:10 2010 -0600
@@ -116,7 +116,7 @@
AC_CONFIG_FILES([
Makefile
- include/Makefile
+ include/laszip/Makefile
src/Makefile
tools/Makefile
laszip-config
@@ -130,7 +130,7 @@
dnl #########################################################################
LOC_MSG()
-LOC_MSG([libLAS configuration summary:])
+LOC_MSG([laszip configuration summary:])
LOC_MSG()
LOC_MSG([ Version..................: ${RELEASE_VERSION}])
LOC_MSG([ Installation directory...: ${prefix}])
@@ -141,7 +141,6 @@
LOC_MSG()
LOC_MSG([ LIBS.....................: ${LIBS}])
LOC_MSG()
-LOC_MSG([ libLAS - http://liblas.org])
LOC_MSG()
dnl EOF
diff -r ebbe9f97a0c9 -r 29f7d17058cc include/Makefile.am
--- a/include/Makefile.am Tue Jan 19 13:44:51 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-laszipdir = $(includedir)/laszip
-
-laszip_HEADERS = lasdefinitions.h \
- laspointreader.h \
- laspointwriter.h \
- laspointreader0compressed.h \
- laspointreader1compressed.h \
- laspointreader2compressed.h \
- laspointreader3compressed.h \
- laspointwriter0compressed.h \
- laspointwriter1compressed.h \
- laspointwriter2compressed.h \
- laspointwriter3compressed.h \
- laspointreader0compressedarithmetic.h \
- laspointreader1compressedarithmetic.h \
- laspointreader2compressedarithmetic.h \
- laspointreader3compressedarithmetic.h \
- laspointwriter0compressedarithmetic.h \
More information about the Liblas-commits
mailing list