[Liblas-commits] hg: 2 new changesets
liblas-commits at liblas.org
liblas-commits at liblas.org
Tue Jun 29 15:23:01 EDT 2010
changeset be7afede63c6 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=be7afede63c6
summary: code normalization
changeset 77b2979fc354 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=77b2979fc354
summary: add TransformI skeleton
diffstat:
include/liblas/lasfilter.hpp | 15 +---------
include/liblas/lastransform.hpp | 60 +++++++++++++++++++++++++++++++++++++++++
include/liblas/liblas.hpp | 4 ++-
src/CMakeLists.txt | 2 +
src/lastransform.cpp | 48 ++++++++++++++++++++++++++++++++
5 files changed, 114 insertions(+), 15 deletions(-)
diffs (185 lines):
diff -r 38e1e3dc53e9 -r 77b2979fc354 include/liblas/lasfilter.hpp
--- a/include/liblas/lasfilter.hpp Tue Jun 29 14:00:31 2010 -0500
+++ b/include/liblas/lasfilter.hpp Tue Jun 29 14:22:54 2010 -0500
@@ -53,19 +53,6 @@
namespace liblas
{
-// class FilterI:
-// {
-// public:
-//
-// void SetType(FilterType t) {m_type = t;}
-// FilterType GetType() const {return m_type;}
-// private:
-//
-// FilterI(FilterI const& other);
-// FilterI& operator=(FilterI const& rhs);
-//
-// FilterType m_type;
-// };
class BoundsFilter: public FilterI
{
@@ -74,7 +61,7 @@
BoundsFilter(double minx, double miny, double maxx, double maxy);
BoundsFilter(double minx, double miny, double maxx, double maxy, double minz, double maxz);
bool filter(const Point& point);
- // void SetKeep(bool bKeep) {detail::ignore_unused_variable_warning(bKeep); return;}
+
private:
double mins[3];
double maxs[3];
diff -r 38e1e3dc53e9 -r 77b2979fc354 include/liblas/lastransform.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/liblas/lastransform.hpp Tue Jun 29 14:22:54 2010 -0500
@@ -0,0 +1,60 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project: libLAS - http://liblas.org - A BSD library for LAS format data.
+ * Purpose: LAS transform class
+ * 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_LASTRANSFORM_HPP_INCLUDED
+#define LIBLAS_LASTRANSFORM_HPP_INCLUDED
+
+#include <liblas/lasversion.hpp>
+#include <liblas/lasheader.hpp>
+#include <liblas/laspoint.hpp>
+#include <liblas/detail/fwd.hpp>
+#include <liblas/liblas.hpp>
+
+#include <vector>
+
+namespace liblas
+{
+
+
+
+} // namespace liblas
+
+#endif // ndef LIBLAS_LASTRANSFORM_HPP_INCLUDED
diff -r 38e1e3dc53e9 -r 77b2979fc354 include/liblas/liblas.hpp
--- a/include/liblas/liblas.hpp Tue Jun 29 14:00:31 2010 -0500
+++ b/include/liblas/liblas.hpp Tue Jun 29 14:22:54 2010 -0500
@@ -199,11 +199,13 @@
};
virtual bool filter(const Point& point) = 0;
+
void SetType(FilterType t) {m_type = t;}
FilterType GetType() const {return m_type; }
+
virtual ~FilterI() {};
- FilterI(FilterType t) {m_type = t;}
+ FilterI(FilterType t) : m_type(t) {}
private:
diff -r 38e1e3dc53e9 -r 77b2979fc354 src/CMakeLists.txt
--- a/src/CMakeLists.txt Tue Jun 29 14:00:31 2010 -0500
+++ b/src/CMakeLists.txt Tue Jun 29 14:22:54 2010 -0500
@@ -52,6 +52,7 @@
${LIBLAS_HEADERS_DIR}/laspoint.hpp
${LIBLAS_HEADERS_DIR}/lasreader.hpp
${LIBLAS_HEADERS_DIR}/lasspatialreference.hpp
+ ${LIBLAS_HEADERS_DIR}/lastransform.hpp
${LIBLAS_HEADERS_DIR}/lasvariablerecord.hpp
${LIBLAS_HEADERS_DIR}/lasversion.hpp
${LIBLAS_HEADERS_DIR}/laswriter.hpp
@@ -83,6 +84,7 @@
laspoint.cpp
lasreader.cpp
lasspatialreference.cpp
+ lastransform.cpp
lasvariablerecord.cpp
laswriter.cpp)
diff -r 38e1e3dc53e9 -r 77b2979fc354 src/lastransform.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lastransform.cpp Tue Jun 29 14:22:54 2010 -0500
@@ -0,0 +1,48 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project: libLAS - http://liblas.org - A BSD library for LAS format data.
+ * Purpose: LAS transform 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.
+ ****************************************************************************/
+
+#include <liblas/lastransform.hpp>
+
+namespace liblas {
+
+
+
+} // namespace liblas
More information about the Liblas-commits
mailing list