[Liblas-commits] r1019 - in trunk: include/liblas include/liblas/detail src

liblas-commits at liblas.org liblas-commits at liblas.org
Thu Feb 12 22:12:16 EST 2009


Author: hobu
Date: Thu Feb 12 22:12:15 2009
New Revision: 1019
URL: http://liblas.org/changeset/1019

Log:
LASSRS skeleton

Added:
   trunk/include/liblas/lassrs.hpp   (contents, props changed)
   trunk/src/lassrs.cpp   (contents, props changed)
Modified:
   trunk/include/liblas/detail/fwd.hpp
   trunk/include/liblas/lasheader.hpp
   trunk/src/Makefile.am

Modified: trunk/include/liblas/detail/fwd.hpp
==============================================================================
--- trunk/include/liblas/detail/fwd.hpp	(original)
+++ trunk/include/liblas/detail/fwd.hpp	Thu Feb 12 22:12:15 2009
@@ -50,6 +50,7 @@
 class LASReader;
 class LASWriter;
 class LASColor;
+class LASSRS;
 
 namespace detail {
 

Modified: trunk/include/liblas/lasheader.hpp
==============================================================================
--- trunk/include/liblas/lasheader.hpp	(original)
+++ trunk/include/liblas/lasheader.hpp	Thu Feb 12 22:12:15 2009
@@ -47,6 +47,8 @@
 #include <liblas/guid.hpp>
 #include <liblas/detail/utility.hpp>
 #include <liblas/lasrecordheader.hpp>
+#include <liblas/lassrs.hpp>
+
 //std
 #include <string>
 #include <vector>
@@ -328,6 +330,9 @@
 	/// Rewrite variable-length record with georeference infomation, if available.
     void SetGeoreference();
     
+    /// Fetch the georeference
+    // LASSRS& GetSRS();
+    
 private:
     
     typedef detail::Point<double> PointScales;

Added: trunk/include/liblas/lassrs.hpp
==============================================================================
--- (empty file)
+++ trunk/include/liblas/lassrs.hpp	Thu Feb 12 22:12:15 2009
@@ -0,0 +1,100 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project:  libLAS - http://liblas.org - A BSD library for LAS format data.
+ * Purpose:  LAS SRS class 
+ * Author:   Howard Butler, hobu.inc at gmail.com
+ *
+ ******************************************************************************
+ * Copyright (c) 2009, 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_LASSRS_HPP_INCLUDED
+#define LIBLAS_LASSRS_HPP_INCLUDED
+
+#include <liblas/cstdint.hpp>
+#include <liblas/detail/fwd.hpp>
+#include <liblas/detail/utility.hpp>
+#include <liblas/lasheader.hpp>
+
+#include <liblas/lasheader.hpp>
+#include <liblas/cstdint.hpp>
+#include <liblas/exception.hpp>
+#include <liblas/detail/utility.hpp>
+
+// GeoTIFF
+#ifdef HAVE_LIBGEOTIFF
+#include <geotiff.h>
+#include <geo_simpletags.h>
+#include "geo_normalize.h"
+#include "geo_simpletags.h"
+#include "geovalues.h"
+#endif // HAVE_LIBGEOTIFF
+
+// std
+#include <string>
+
+
+// GDAL OSR
+#ifdef HAVE_GDAL
+#include <ogr_srs_api.h>
+#endif
+
+// std
+#include <stdexcept> // std::out_of_range
+#include <cstdlib> // std::size_t
+
+namespace liblas {
+
+/// Spatial Reference System container for libLAS
+class LASSRS
+{
+public:
+
+
+
+    LASSRS();
+    LASSRS(LASSRS const& other);
+    LASSRS& operator=(LASSRS const& rhs);
+
+
+private:
+
+
+};
+
+
+
+} // namespace liblas
+
+#endif // LIBLAS_LASSRS_HPP_INCLUDED

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Feb 12 22:12:15 2009
@@ -23,6 +23,7 @@
 	lasfile.cpp \
 	las_c_api.cpp \
 	lascolor.cpp \
+	lassrs.cpp \
     detail/reader.cpp \
     detail/reader10.cpp \
     detail/reader11.cpp \

Added: trunk/src/lassrs.cpp
==============================================================================
--- (empty file)
+++ trunk/src/lassrs.cpp	Thu Feb 12 22:12:15 2009
@@ -0,0 +1,83 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project:  libLAS - http://liblas.org - A BSD library for LAS format data.
+ * Purpose:  LAS SRS class 
+ * Author:   Howard Butler, hobu.inc at gmail.com
+ *
+ ******************************************************************************
+ * 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.
+ ****************************************************************************/
+
+#include <liblas/lassrs.hpp>
+
+namespace liblas {
+
+LASSRS::LASSRS() 
+{
+    
+}
+// 
+// LASPoint::LASPoint(LASPoint const& other) :
+//     m_intensity(other.m_intensity),
+//     m_flags(other.m_flags),
+//     m_class(other.m_class),
+//     m_angleRank(other.m_angleRank),
+//     m_userData(other.m_userData),
+//     m_pointSourceId(other.m_pointSourceId),
+//     m_gpsTime(other.m_gpsTime)
+// {
+//     std::memcpy(m_coords, other.m_coords, sizeof(m_coords));
+// }
+// 
+// LASPoint& LASPoint::operator=(LASPoint const& rhs)
+// {
+//     if (&rhs != this)
+//     {
+//         m_coords[0] = rhs.m_coords[0];
+//         m_coords[1] = rhs.m_coords[1];
+//         m_coords[2] = rhs.m_coords[2];
+//         m_intensity = rhs.m_intensity;
+//         m_flags = rhs.m_flags;
+//         m_class = rhs.m_class;
+//         m_angleRank = rhs.m_angleRank;
+//         m_userData = rhs.m_userData;
+//         m_pointSourceId = rhs.m_pointSourceId;
+//         m_gpsTime = rhs.m_gpsTime;
+//     }
+//     return *this;
+// }
+
+
+
+} // namespace liblas


More information about the Liblas-commits mailing list