[Liblas-commits] hg: reorganize location of reader files
liblas-commits at liblas.org
liblas-commits at liblas.org
Fri Jan 29 11:24:38 EST 2010
changeset f126992f30b5 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=f126992f30b5
summary: reorganize location of reader files
diffstat:
include/Makefile.am | 8 +-
include/liblas/detail/reader.hpp | 117 ---------
include/liblas/detail/reader/reader.hpp | 117 +++++++++
include/liblas/detail/reader/reader10.hpp | 68 +++++
include/liblas/detail/reader/reader11.hpp | 68 +++++
include/liblas/detail/reader/reader12.hpp | 68 +++++
include/liblas/detail/reader10.hpp | 68 -----
include/liblas/detail/reader11.hpp | 68 -----
include/liblas/detail/reader12.hpp | 68 -----
src/Makefile.am | 8 +-
src/detail/reader.cpp | 365 ----------------------------
src/detail/reader/reader.cpp | 365 ++++++++++++++++++++++++++++
src/detail/reader/reader10.cpp | 331 +++++++++++++++++++++++++
src/detail/reader/reader11.cpp | 325 +++++++++++++++++++++++++
src/detail/reader/reader12.cpp | 390 ++++++++++++++++++++++++++++++
src/detail/reader10.cpp | 331 -------------------------
src/detail/reader11.cpp | 325 -------------------------
src/detail/reader12.cpp | 390 ------------------------------
src/lasreader.cpp | 2 +-
19 files changed, 1741 insertions(+), 1741 deletions(-)
diffs (truncated from 3576 to 300 lines):
diff -r 38451089c06a -r f126992f30b5 include/Makefile.am
--- a/include/Makefile.am Fri Jan 29 09:00:25 2010 -0600
+++ b/include/Makefile.am Fri Jan 29 10:19:36 2010 -0600
@@ -21,10 +21,10 @@
liblas/capi/las_config.h \
liblas/detail/endian.hpp \
liblas/detail/fwd.hpp \
- liblas/detail/reader.hpp \
- liblas/detail/reader10.hpp \
- liblas/detail/reader11.hpp \
- liblas/detail/reader12.hpp \
+ liblas/detail/reader/reader.hpp \
+ liblas/detail/reader/reader10.hpp \
+ liblas/detail/reader/reader11.hpp \
+ liblas/detail/reader/reader12.hpp \
liblas/detail/sha1.hpp \
liblas/detail/sharedptr.hpp \
liblas/detail/timer.hpp \
diff -r 38451089c06a -r f126992f30b5 include/liblas/detail/reader.hpp
--- a/include/liblas/detail/reader.hpp Fri Jan 29 09:00:25 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/******************************************************************************
- * $Id$
- *
- * Project: libLAS - http://liblas.org - A BSD library for LAS format data.
- * Purpose: Reader 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_READER_HPP_INCLUDED
-#define LIBLAS_DETAIL_READER_HPP_INCLUDED
-
-#include <liblas/cstdint.hpp>
-#include <liblas/lasversion.hpp>
-#include <liblas/lasspatialreference.hpp>
-#include <liblas/detail/fwd.hpp>
-
-#ifndef HAVE_GDAL
- typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH;
- typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH;
-#endif
-
-// std
-#include <iosfwd>
-
-namespace liblas { namespace detail {
-
-struct PointRecord;
-
-class Reader
-{
-public:
-
- Reader(std::istream& ifs);
- virtual ~Reader();
- virtual LASVersion GetVersion() const = 0;
- virtual bool ReadHeader(LASHeader& header) = 0;
- virtual bool ReadNextPoint(LASPoint& point, const LASHeader& header) = 0;
- virtual bool ReadPointAt(std::size_t n, LASPoint& point, const LASHeader& header) = 0;
-
- std::istream& GetStream() const;
- bool ReadVLR(LASHeader& header);
- bool ReadGeoreference(LASHeader& header);
- void Reset(LASHeader const& header);
- void SetSRS(const LASSpatialReference& srs);
- void SetInputSRS(const LASSpatialReference& srs);
- void SetOutputSRS(const LASSpatialReference& srs);
-
-protected:
-
- typedef std::istream::off_type off_type;
- typedef std::istream::pos_type pos_type;
-
- std::istream& m_ifs;
- uint32_t m_size;
- uint32_t m_current;
- LASSpatialReference m_out_srs;
- LASSpatialReference m_in_srs;
- OGRCoordinateTransformationH m_transform;
- OGRSpatialReferenceH m_in_ref;
- OGRSpatialReferenceH m_out_ref;
-
- void FillPoint(PointRecord& record, LASPoint& point, const LASHeader& header);
- void Project(LASPoint& point);
- bool HasPointDataSignature();
-private:
-
- // Blocked copying operations, declared but not defined.
- Reader(Reader const& other);
- Reader& operator=(Reader const& rhs);
- void CreateTransform();
-};
-
-class ReaderFactory
-{
-public:
-
- // TODO: prototypes
- static Reader* Create(std::istream& ifs);
- static void Destroy(Reader* p);
-};
-
-}} // namespace liblas::detail
-
-#endif // LIBLAS_DETAIL_READER_HPP_INCLUDED
diff -r 38451089c06a -r f126992f30b5 include/liblas/detail/reader/reader.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/liblas/detail/reader/reader.hpp Fri Jan 29 10:19:36 2010 -0600
@@ -0,0 +1,117 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project: libLAS - http://liblas.org - A BSD library for LAS format data.
+ * Purpose: Reader 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_READER_HPP_INCLUDED
+#define LIBLAS_DETAIL_READER_HPP_INCLUDED
+
+#include <liblas/cstdint.hpp>
+#include <liblas/lasversion.hpp>
+#include <liblas/lasspatialreference.hpp>
+#include <liblas/detail/fwd.hpp>
+
+#ifndef HAVE_GDAL
+ typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH;
+ typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH;
+#endif
+
+// std
+#include <iosfwd>
+
+namespace liblas { namespace detail {
+
+struct PointRecord;
+
+class Reader
+{
+public:
+
+ Reader(std::istream& ifs);
+ virtual ~Reader();
+ virtual LASVersion GetVersion() const = 0;
+ virtual bool ReadHeader(LASHeader& header) = 0;
+ virtual bool ReadNextPoint(LASPoint& point, const LASHeader& header) = 0;
+ virtual bool ReadPointAt(std::size_t n, LASPoint& point, const LASHeader& header) = 0;
+
+ std::istream& GetStream() const;
+ bool ReadVLR(LASHeader& header);
+ bool ReadGeoreference(LASHeader& header);
+ void Reset(LASHeader const& header);
+ void SetSRS(const LASSpatialReference& srs);
+ void SetInputSRS(const LASSpatialReference& srs);
+ void SetOutputSRS(const LASSpatialReference& srs);
+
+protected:
+
+ typedef std::istream::off_type off_type;
+ typedef std::istream::pos_type pos_type;
+
+ std::istream& m_ifs;
+ uint32_t m_size;
+ uint32_t m_current;
+ LASSpatialReference m_out_srs;
+ LASSpatialReference m_in_srs;
+ OGRCoordinateTransformationH m_transform;
+ OGRSpatialReferenceH m_in_ref;
+ OGRSpatialReferenceH m_out_ref;
+
+ void FillPoint(PointRecord& record, LASPoint& point, const LASHeader& header);
+ void Project(LASPoint& point);
+ bool HasPointDataSignature();
+private:
+
+ // Blocked copying operations, declared but not defined.
+ Reader(Reader const& other);
+ Reader& operator=(Reader const& rhs);
+ void CreateTransform();
+};
+
+class ReaderFactory
+{
+public:
+
+ // TODO: prototypes
+ static Reader* Create(std::istream& ifs);
+ static void Destroy(Reader* p);
+};
+
+}} // namespace liblas::detail
+
+#endif // LIBLAS_DETAIL_READER_HPP_INCLUDED
diff -r 38451089c06a -r f126992f30b5 include/liblas/detail/reader/reader10.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/liblas/detail/reader/reader10.hpp Fri Jan 29 10:19:36 2010 -0600
@@ -0,0 +1,68 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project: libLAS - http://liblas.org - A BSD library for LAS format data.
+ * Purpose: LAS 1.0 reader 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,
More information about the Liblas-commits
mailing list