[Liblas-commits] hg: 2 new changesets
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Jan 18 15:16:00 EST 2010
changeset d217232380f4 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=d217232380f4
summary: more cleanup
changeset 0f0ee17ebce8 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=0f0ee17ebce8
summary: some cleanups
diffstat:
include/Makefile.am | 2 +-
include/liblas/detail/format.hpp | 111 ---------------------------------------
include/liblas/lasformat.hpp | 111 +++++++++++++++++++++++++++++++++++++++
src/Makefile.am | 30 +++++-----
src/detail/format.cpp | 91 -------------------------------
src/lasformat.cpp | 91 +++++++++++++++++++++++++++++++
6 files changed, 218 insertions(+), 218 deletions(-)
diffs (truncated from 493 to 300 lines):
diff -r b9d6c3ed8f42 -r 0f0ee17ebce8 include/Makefile.am
--- a/include/Makefile.am Mon Jan 18 13:24:49 2010 -0600
+++ b/include/Makefile.am Mon Jan 18 14:06:45 2010 -0600
@@ -16,13 +16,13 @@
liblas/lasspatialreference.hpp \
liblas/laswriter.hpp \
liblas/liblas.hpp \
+ liblas/lasformat.hpp \
liblas/capi/liblas.h \
liblas/capi/las_version.h \
liblas/capi/las_config.h \
liblas/detail/endian.hpp \
liblas/detail/file.hpp \
liblas/detail/fwd.hpp \
- liblas/detail/format.hpp \
liblas/detail/reader.hpp \
liblas/detail/reader10.hpp \
liblas/detail/reader11.hpp \
diff -r b9d6c3ed8f42 -r 0f0ee17ebce8 include/liblas/detail/format.hpp
--- a/include/liblas/detail/format.hpp Mon Jan 18 13:24:49 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/******************************************************************************
- * $Id$
- *
- * Project: libLAS - http://liblas.org - A BSD library for LAS format data.
- * Purpose: LAS 1.0 writer implementation for C++ libLAS
- * Author: Mateusz Loskot, mateusz at loskot.net
- *
- ******************************************************************************
- * Copyright (c) 2008, Mateusz Loskot
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following
- * conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of the Martin Isenburg or Iowa Department
- * of Natural Resources nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- ****************************************************************************/
-
-#ifndef LIBLAS_DETAIL_FORMAT_HPP_INCLUDED
-#define LIBLAS_DETAIL_FORMAT_HPP_INCLUDED
-
-#include <liblas/detail/fwd.hpp>
-#include <liblas/cstdint.hpp>
-#include <liblas/lasheader.hpp>
-// std
-#include <iosfwd>
-
-namespace liblas { namespace detail {
-
-class Format
-{
-public:
-
- Format(liblas::uint8_t major, liblas::uint8_t minor, liblas::LASHeader::PointSize& size);
- virtual ~Format();
-
- virtual liblas::LASHeader::PointSize GetByteSize() const = 0;
- virtual void SetByteSize(liblas::LASHeader::PointSize& size) const = 0;
-
- liblas::uint8_t GetVersionMajor() { return m_versionmajor; }
- void SetVersionMajor(liblas::uint8_t v) {m_versionmajor = v; }
-
- liblas::uint8_t GetVersionMinor() { return m_versionminor; }
- void SetVersionMinor(liblas::uint8_t v) {m_versionminor = v; }
-
- bool IsCompressed() { return m_compressed; }
- void SetCompressed(bool v) {m_compressed = v;}
-
- virtual bool HasColor() const = 0;
- virtual bool HasTime() const = 0;
-
-
-protected:
-
- liblas::LASHeader::PointSize m_size;
- uint8_t m_versionminor;
- uint8_t m_versionmajor;
- bool m_compressed;
-
-private:
-
- // Blocked copying operations, declared but not defined.
- Format(Format const& other);
- Format& operator=(Format const& rhs);
-
-
-};
-
-class PointFormat : public Format
-{
-public:
-
- typedef Format Base;
-
- PointFormat(liblas::uint8_t major, liblas::uint8_t minor, liblas::LASHeader::PointSize& size);
- bool HasColor() { return m_hasColor; }
- bool HasTime() { return m_hasTime; }
- bool IsCompressed() { return false; }
-
-private:
-
- bool m_hasColor;
- bool m_hasTime;
-};
-
-}} // namespace liblas::detail
-
-#endif // LIBLAS_DETAIL_FORMAT_HPP_INCLUDED
diff -r b9d6c3ed8f42 -r 0f0ee17ebce8 include/liblas/lasformat.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/liblas/lasformat.hpp Mon Jan 18 14:06:45 2010 -0600
@@ -0,0 +1,111 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project: libLAS - http://liblas.org - A BSD library for LAS format data.
+ * Purpose: LAS PointFormat implementation for C++ libLAS
+ * Author: Howard Butler, hobu.inc at gmail.com
+ *
+ ******************************************************************************
+ * Copyright (c) 2010, Howard Butler
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided
+ * with the distribution.
+ * * Neither the name of the Martin Isenburg or Iowa Department
+ * of Natural Resources nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ ****************************************************************************/
+
+#ifndef LIBLAS_FORMAT_HPP_INCLUDED
+#define LIBLAS_FORMAT_HPP_INCLUDED
+
+#include <liblas/detail/fwd.hpp>
+#include <liblas/cstdint.hpp>
+#include <liblas/lasheader.hpp>
+// std
+#include <iosfwd>
+
+namespace liblas {
+
+class LASFormat
+{
+public:
+
+ LASFormat(liblas::uint8_t major, liblas::uint8_t minor, liblas::LASHeader::PointSize size);
+ virtual ~LASFormat();
+
+ virtual liblas::LASHeader::PointSize GetByteSize() const = 0;
+ virtual void SetByteSize(liblas::LASHeader::PointSize& size) const = 0;
+
+ liblas::uint8_t GetVersionMajor() { return m_versionmajor; }
+ void SetVersionMajor(liblas::uint8_t v) {m_versionmajor = v; }
+
+ liblas::uint8_t GetVersionMinor() { return m_versionminor; }
+ void SetVersionMinor(liblas::uint8_t v) {m_versionminor = v; }
+
+ bool IsCompressed() { return m_compressed; }
+ void SetCompressed(bool v) {m_compressed = v;}
+
+ virtual bool HasColor() const = 0;
+ virtual bool HasTime() const = 0;
+
+
+protected:
+
+ liblas::LASHeader::PointSize m_size;
+ uint8_t m_versionminor;
+ uint8_t m_versionmajor;
+ bool m_compressed;
+
+private:
+
+ // Blocked copying operations, declared but not defined.
+ LASFormat(LASFormat const& other);
+ LASFormat& operator=(LASFormat const& rhs);
+
+
+};
+
+class LASPointFormat : public LASFormat
+{
+public:
+
+ typedef LASFormat Base;
+
+ LASPointFormat(liblas::uint8_t major, liblas::uint8_t minor, liblas::LASHeader::PointSize size);
+ bool HasColor() { return m_hasColor; }
+ bool HasTime() { return m_hasTime; }
+ bool IsCompressed() { return false; }
+
+private:
+
+ bool m_hasColor;
+ bool m_hasTime;
+};
+
+} // namespace liblas
+
+#endif // LIBLAS_FORMAT_HPP_INCLUDED
diff -r b9d6c3ed8f42 -r 0f0ee17ebce8 src/Makefile.am
--- a/src/Makefile.am Mon Jan 18 13:24:49 2010 -0600
+++ b/src/Makefile.am Mon Jan 18 14:06:45 2010 -0600
@@ -26,8 +26,8 @@
lib_LTLIBRARIES = liblas.la
liblas_la_SOURCES = \
- lasclassification.cpp \
- lascolor.cpp \
+ lasclassification.cpp \
+ lascolor.cpp \
laserror.cpp \
laspoint.cpp \
lasheader.cpp \
@@ -37,27 +37,27 @@
lasfile.cpp \
las_c_api.cpp \
lasspatialreference.cpp \
- detail/format.cpp \
- detail/reader.cpp \
- detail/reader10.cpp \
- detail/reader11.cpp \
- detail/reader12.cpp \
- detail/writer.cpp \
- detail/writer10.cpp \
- detail/writer11.cpp \
+ lasformat.cpp \
+ detail/reader.cpp \
+ detail/reader10.cpp \
+ detail/reader11.cpp \
+ detail/reader12.cpp \
+ detail/writer.cpp \
+ detail/writer10.cpp \
+ detail/writer11.cpp \
detail/writer12.cpp \
- detail/file.cpp
+ detail/file.cpp
if GDAL_IS_CONFIG
liblas_la_SOURCES += gt_wkt_srs.cpp gt_citation.cpp tifvsi.cpp
endif
if SPATIALINDEX_IS_CONFIG
-liblas_la_SOURCES += index/index.cpp \
- index/datastream.cpp \
- index/visitor.cpp \
+liblas_la_SOURCES += index/index.cpp \
+ index/datastream.cpp \
+ index/visitor.cpp \
index/query.cpp \
- index/storage.cpp
+ index/storage.cpp
More information about the Liblas-commits
mailing list