[Liblas-commits] laszip: vs2010 detritus

liblas-commits at liblas.org liblas-commits at liblas.org
Tue Jan 11 11:55:25 EST 2011


details:   http://hg.liblas.orglaszip/rev/b9a74cfdfe13
changeset: 130:b9a74cfdfe13
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Mon Jan 10 16:44:17 2011 -0800
description:
vs2010 detritus
Subject: laszip: pull-merge

details:   http://hg.liblas.orglaszip/rev/a8cd44a5f152
changeset: 131:a8cd44a5f152
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Tue Jan 11 08:42:14 2011 -0800
description:
pull-merge

diffstat:

 .hgignore                         |     1 +
 CMakeLists.txt                    |    19 +-
 ChangeLog                         |  1057 +++++++++++++++++++++++++++++++++++++
 include/laszip/export.hpp         |     2 +-
 src/lasreaditemraw.hpp            |   121 ++-
 src/lasreadpoint.cpp              |    22 +-
 src/laswriteitemcompressed_v1.cpp |    70 +-
 src/laswriteitemraw.hpp           |   140 +++-
 src/laswritepoint.cpp             |    20 +-
 src/mydefs.hpp                    |    29 +-
 10 files changed, 1324 insertions(+), 157 deletions(-)

diffs (truncated from 1717 to 300 lines):

diff -r c544849de62f -r a8cd44a5f152 .hgignore
--- a/.hgignore	Fri Jan 07 09:24:25 2011 -0600
+++ b/.hgignore	Tue Jan 11 08:42:14 2011 -0800
@@ -84,6 +84,7 @@
 laszip.sdf
 laszip.sln
 laszip/laszip.sdf
+*.tlog
 
 tools/laszip.pc
 tools/laszip-config
diff -r c544849de62f -r a8cd44a5f152 CMakeLists.txt
--- a/CMakeLists.txt	Fri Jan 07 09:24:25 2011 -0600
+++ b/CMakeLists.txt	Tue Jan 11 08:42:14 2011 -0800
@@ -11,7 +11,7 @@
 
 SET(LASZIP_VERSION_MAJOR "1")
 SET(LASZIP_VERSION_MINOR "0")
-SET(LASZIP_VERSION_PATCH "b1")
+SET(LASZIP_VERSION_PATCH "0b1")
 set(VERSION "${LASZIP_VERSION_MAJOR}.${LASZIP_VERSION_MINOR}.${LASZIP_VERSION_PATCH}")
 SET(LASZIP_LIB_SOVERSION "1.0.0")
 
@@ -127,22 +127,25 @@
 SET(CPACK_PACKAGE_VERSION_PATCH ${LASZIP_VERSION_MINOR})
 SET(OSGEO4W_UPSTREAM_RELEASE "1")
 
-SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP;TBZ2")
+SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
 SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
-SET(CPACK_RESOURCE_FILE_LICENSE "${laszip_SOURCE_DIR}/COPYING")
+#SET(CPACK_RESOURCE_FILE_LICENSE "${laszip_SOURCE_DIR}/COPYING")
 
 set(CPACK_SOURCE_PACKAGE_FILE_NAME
   "${CMAKE_PROJECT_NAME}-${VERSION}")
 
 list(APPEND CPACK_SOURCE_IGNORE_FILES "_CPack_Packages")
 list(APPEND CPACK_SOURCE_IGNORE_FILES ".gz")
-list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")
-list(APPEND CPACK_SOURCE_IGNORE_FILES ".zip")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeFiles")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "bin")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "hobu-config.bat")
+# list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")
+# list(APPEND CPACK_SOURCE_IGNORE_FILES ".zip")
 list(APPEND CPACK_SOURCE_IGNORE_FILES ".hg")
-
+# 
 list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeCache.txt")
-
-list(APPEND CPACK_SOURCE_IGNORE_FILES "CPackConfig.cmake")
+# 
+# list(APPEND CPACK_SOURCE_IGNORE_FILES "CPackConfig.cmake")
 
 include(CPack)
 
diff -r c544849de62f -r a8cd44a5f152 ChangeLog
--- a/ChangeLog	Fri Jan 07 09:24:25 2011 -0600
+++ b/ChangeLog	Tue Jan 11 08:42:14 2011 -0800
@@ -0,0 +1,1057 @@
+2011-01-07  isenburg  <isenburg>
+
+	* src/mydefs.hpp:
+	more efficient big endian handling
+	[7ff2569cc64a] [tip]
+
+	* src/lasreaditemraw.hpp, src/lasreadpoint.cpp,
+	src/laswriteitemraw.hpp, src/laswritepoint.cpp:
+	more efficient big endian handling
+	[7ae269f43dde]
+
+2011-01-07  Howard Butler  <hobu.inc at gmail.com>
+
+	* CMakeLists.txt:
+	turn off osgeo4w building by default
+	[c544849de62f]
+
+2011-01-06  Michael P. Gerlek  <mpg at flaxen.com>
+
+	* src/lasunzipper.cpp, src/laszipper.cpp:
+	do need to delete martin's stream (but not ours)
+	[71658514f280]
+
+2011-01-06  isenburg  <isenburg>
+
+	* src/lasreaditemraw.hpp, src/laswriteitemraw.hpp:
+	for testing if extra freads/fwrites affect performance
+	[a8ad11ceb54b]
+
+2011-01-06  Howard Butler  <hobu.inc at gmail.com>
+
+	* include/laszip/lasunzipper.hpp:
+	export LASunzipper too
+	[89e9ea2f8f7c]
+
+2011-01-05  Howard Butler  <hobu.inc at gmail.com>
+
+	* src/CMakeLists.txt:
+	add install_name for OSX
+	[880013a5e96a]
+
+	* include/laszip/export.hpp, include/laszip/laszip.hpp,
+	include/laszip/laszipper.hpp:
+	put LASZIP_DLL back. Martin, please let me know your error
+	message(s) instead of removing this as I need it for the OSGeo4W
+	windows deployment
+	[057be33cd6db]
+
+2011-01-05  isenburg  <isenburg>
+
+	* tools/laszippertest.cpp:
+	forgot to copy & commit
+	[daac63e565cf]
+
+2011-01-04  isenburg  <isenburg>
+
+	* src/bytestreamin.hpp, src/bytestreamin_file.hpp,
+	src/bytestreamin_istream.hpp, src/bytestreamout.hpp,
+	src/bytestreamout_file.hpp, src/bytestreamout_ostream.hpp,
+	src/lasreaditemcompressed_v1.cpp, src/lasreaditemcompressed_v1.hpp,
+	src/lasreaditemraw.hpp, src/lasreadpoint.cpp, src/lasreadpoint.hpp,
+	src/lasunzipper.cpp, src/laswriteitemcompressed_v1.cpp,
+	src/laswriteitemcompressed_v1.hpp, src/laswriteitemraw.hpp,
+	src/laswritepoint.cpp, src/laswritepoint.hpp, src/laszip.cpp,
+	src/laszipper.cpp, src/rangemodel.cpp:
+	improved endianness again, renamed compression to algorithm,
+	improved wavepacket13 compressor
+	[dcd14845f9ed]
+
+	* include/laszip/lasunzipper.hpp, include/laszip/laszip.hpp,
+	include/laszip/laszipper.hpp:
+	mpg: the LAS_ZIP_DLL does not work with my code. can you ifdef it?
+	[a8aa0185aa63]
+
+2011-01-04  Howard Butler  <hobu.inc at gmail.com>
+
+	* .hgignore:
+	add a few more ignores
+	[473e998d2955]
+
+	* cmake/modules/BuildOSGeo4W.cmake:
+	simplify to a single package install for osgeo4w
+	[14af050db188]
+
+2011-01-03  Howard Butler  <hobu.inc at gmail.com>
+
+	* CMakeLists.txt, cmake/modules/BuildOSGeo4W.cmake:
+	fix osgeo4w dependency and add OSGEO4W_UPSTREAM_RELEASE usage
+	[6cfec438cea3]
+
+	* CMakeLists.txt, cmake/modules/BuildOSGeo4W.cmake:
+	osgeo4w packaging
+	[bb381252df0d]
+
+	* cmake/modules/BuildOSGeo4W.cmake:
+	add osgeo4w packaging script
+	[5702cc183fe5]
+
+	* tools/CMakeLists.txt, tools/laszip-config.in, tools/laszip.pc.in:
+	add laszip-config and laszip.pc packageconfig
+	[5ea850338ed1]
+
+	* include/laszip/Makefile.am:
+	bring in line with cmake setup
+	[03aa58b60bf5]
+
+	* configure.ac:
+	bring in line with cmake setup
+	[0a245357c2cd]
+
+	* .hgignore:
+	ignore .lax test files and change location of laszip-config and
+	laszip.pc package config files
+	[3075e12e3a47]
+
+	* CMakeLists.txt, src/CMakeLists.txt:
+	add packaging and soname for dll
+	[43aa7323c711]
+
+	* laszip-config.in, tools/CMakeLists.txt, tools/laszip-config.in:
+	add a laszip-config target
+	[d48a54cc320b]
+
+	* .hgignore:
+	add a few more ignores
+	[f3729328ee77]
+
+	* src/CMakeLists.txt, src/lasreaditemrawendianswapped.hpp,
+	src/laswriteitemrawendianswapped.hpp:
+	these files are not used anymore according to Martin
+	[25aa62883097]
+
+2010-12-30  Howard Butler  <hobu.inc at gmail.com>
+
+	* hobu-config.bat:
+	add my base config
+	[8fe8b5444dcf]
+
+	* src/CMakeLists.txt, tools/CMakeLists.txt:
+	export the laszip dll items
+	[799d195fe864]
+
+	* CMakeLists.txt, src/CMakeLists.txt:
+	fix install target to LASZIP_LIB_DIR instead of _BIN, build shared
+	library by default
+	[f30dd5b85cdc]
+
+	* include/laszip/export.hpp, include/laszip/lasunzipper.hpp,
+	include/laszip/laszip.hpp, include/laszip/laszipper.hpp,
+	src/CMakeLists.txt:
+	start adding LASZIP_DLL exports definition in preparation for shared
+	library build/install/usage
+	[724ec4f2a7de]
+
+	* CMakeLists.txt:
+	add logic or setting CMAKE_BUILD_TYPE to Debug by default if not set
+	and not in the cache
+	[35628e849688]
+
+	* src/CMakeLists.txt:
+	add some missing header files
+	[adc903683a4b]
+
+2010-12-27  Michael P. Gerlek  <mpg at flaxen.com>
+
+	* include/laszip/lasunzipper.hpp, include/laszip/laszipper.hpp:
+	explicit default param no longer needed
+	[16cbedc7335f]
+
+	* include/laszip/lasunzipper.hpp, include/laszip/laszip.hpp,
+	include/laszip/laszipper.hpp, src/lasreadpoint.cpp,
+	src/lasreadpoint.hpp, src/lasunzipper.cpp, src/laswritepoint.cpp,
+	src/laswritepoint.hpp, src/laszipper.cpp, tools/laszippertest.cpp:
+	use an enum for the compression type, for type safety
+	[276b21e82629]
+
+	* tools/laszippertest.cpp:
+	fix err checks on open()
+	[ce1bdb2a9e26]
+
+	* src/bytestreamin_file.hpp, src/bytestreamin_istream.hpp:
+	remove fprintf calls
+	[ba16595e644c]
+
+	* src/rangemodel.cpp:
+	remove calls to fprintf, exit
+	[7af78ceb3bfa]
+
+2010-12-23  isenburg  <isenburg>
+
+	* src/lasreaditemcompressed_v1.cpp, src/lasreaditemcompressed_v1.hpp,
+	src/laswriteitemcompressed_v1.cpp,
+	src/laswriteitemcompressed_v1.hpp:
+	one last optimization to compress 1.5 percent better
+	[e815143ce051]
+
+	* src/lasreaditemcompressed_v1.cpp, src/lasreaditemcompressed_v1.hpp,
+	src/lasreadpoint.cpp, src/laswriteitemcompressed_v1.cpp,
+	src/laswriteitemcompressed_v1.hpp:
+	fix of pointreader and small optimization of POINT10 compressor
+	[113c76a6708b]
+
+	* tools/laszippertest.cpp:
+	added test for new WAVEPACKET13 compressor
+	[294dfaf3b0d3]
+
+	* tools/laszippertest.cpp:
+	added test for new WAVEPACKET13 compressor
+	[30313ba06a38]
+
+	* src/arithmeticdecoder.cpp, src/arithmeticencoder.cpp,
+	src/lasreaditemcompressed_v1.cpp, src/lasreaditemcompressed_v1.hpp,
+	src/laswriteitemcompressed_v1.cpp,
+	src/laswriteitemcompressed_v1.hpp, src/laswritepoint.cpp:
+	updated RGB encoding to be endian neutral
+	[7770fdf9c7c2]
+
+2010-12-22  Michael P. Gerlek  <mpg at flaxen.com>
+
+	* src/laszip.cpp:
+	sync up w/ Martin's versioning
+	[4daf73355dc6]
+
+	* src/lasreadpoint.cpp:
+	memleak
+	[aabe8bc36fb0]
+
+	* include/laszip/laszip.hpp, src/CMakeLists.txt, src/Makefile.am,
+	src/lasunzipper.cpp, src/laszip.cpp, src/laszipper.cpp:
+	move header functions into .cpp file
+	[b939bfb7bdf7]
+
+	* tools/laszippertest.cpp:
+	sync w/ Martin's changes
+	[e8f5528c3d30]
+
+	* include/laszip/lasunzipper.hpp, include/laszip/laszipper.hpp,
+	src/lasunzipper.cpp, src/laszipper.cpp:
+	pull-merge
+	[e651d0722c7e]


More information about the Liblas-commits mailing list