move bounds to include/pdal/util #699

PDAL · Jan 20, 2015 · 4675db0 · 4675db0
1 parent 146cac4
commit 4675db0
Show file tree

Hide file tree

Showing 23 changed files with 17 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -80,6 +80,8 @@ else(WIN32)
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PDAL_OUTPUT_LIB_DIR}")
 endif(WIN32)
 
+set(PDAL_HEADERS_DIR "${PROJECT_SOURCE_DIR}/include/pdal")
+set(PDAL_UTIL_DIR "${PROJECT_SOURCE_DIR}/util")
 
 #------------------------------------------------------------------------------
 # misc user options

diff --git a/filters/chipper/ChipperFilter.hpp b/filters/chipper/ChipperFilter.hpp
@@ -44,7 +44,6 @@
 #include <vector>
 
 #include <pdal/Filter.hpp>
-#include <pdal/Bounds.hpp>
 #include <pdal/PointBuffer.hpp>
 
 namespace pdal

diff --git a/filters/crop/CropFilter.hpp b/filters/crop/CropFilter.hpp
@@ -35,7 +35,6 @@
 #pragma once
 
 #include <pdal/Filter.hpp>
-#include <pdal/Bounds.hpp>
 
 #ifdef PDAL_HAVE_GEOS
 #include <geos_c.h>

diff --git a/include/pdal/Metadata.hpp b/include/pdal/Metadata.hpp
@@ -40,7 +40,7 @@
 #include <boost/uuid/uuid_io.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include <pdal/Bounds.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/Utils.hpp>
 #include <pdal/SpatialReference.hpp>
 

diff --git a/include/pdal/PDALUtils.hpp b/include/pdal/PDALUtils.hpp
@@ -40,7 +40,6 @@
 #include <pdal/Dimension.hpp>
 #include <pdal/pdal_defines.h>
 #include <pdal/pdal_export.hpp>
-#include <pdal/Bounds.hpp>
 #include <pdal/PointContext.hpp>
 #include <pdal/PointBuffer.hpp>
 #include <pdal/Options.hpp>
@@ -213,7 +212,7 @@ void PDAL_DLL write_rst(std::ostream& ost,
                const boost::property_tree::ptree& pt,
                int level=0);
 
-                      
+
 inline std::ostream& toRST(const PointBuffer& buffer, std::ostream& os)
 {
     const Dimension::IdList& dims = buffer.dims();

diff --git a/include/pdal/PointBuffer.hpp b/include/pdal/PointBuffer.hpp
@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include <pdal/Bounds.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/pdal_internal.hpp>
 #include <pdal/PointContext.hpp>
 

diff --git a/include/pdal/QuadIndex.hpp b/include/pdal/QuadIndex.hpp
@@ -38,7 +38,7 @@
 #include <memory>
 
 #include <pdal/pdal_export.hpp>
-#include <pdal/Bounds.hpp>
+#include <pdal/util/Bounds.hpp>
 
 namespace pdal
 {

diff --git a/include/pdal/QuickInfo.hpp b/include/pdal/QuickInfo.hpp
@@ -36,7 +36,7 @@
 
 #include <vector>
 
-#include <pdal/Bounds.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/SpatialReference.hpp>
 
 namespace pdal
@@ -45,7 +45,7 @@ namespace pdal
 struct QuickInfo
 {
 public:
-    BOX3D m_bounds;   
+    BOX3D m_bounds;
     SpatialReference m_srs;
     point_count_t m_pointCount;
     std::vector<std::string> m_dimNames;

diff --git a/util/Bounds.hpp → include/pdal/util/Bounds.hpp b/util/Bounds.hpp → include/pdal/util/Bounds.hpp
diff --git a/io/las/LasHeader.hpp b/io/las/LasHeader.hpp
@@ -41,7 +41,7 @@
 #include <boost/uuid/uuid.hpp>
 #include <boost/property_tree/ptree.hpp>
 
-#include <pdal/Bounds.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/pdal_config.hpp>
 #include <pdal/gitsha.h>
 
@@ -195,7 +195,7 @@ class PDAL_DLL LasHeader
 
     /// Set number of bytes from the beginning to the first point record.
     /// \param  offset - Offset to start of point data.
-    void setPointOffset(uint32_t offset) 
+    void setPointOffset(uint32_t offset)
           { m_pointOffset = offset; }
 
     /// Set the point format.

diff --git a/io/las/SummaryData.hpp b/io/las/SummaryData.hpp
@@ -38,7 +38,6 @@
 #include <array>
 
 #include <pdal/pdal_internal.hpp>
-#include <pdal/Bounds.hpp>
 
 #include "LasHeader.hpp"
 

diff --git a/kernels/random/RandomKernel.hpp b/kernels/random/RandomKernel.hpp
@@ -37,7 +37,6 @@
 #include <pdal/FileUtils.hpp>
 #include "Kernel.hpp"
 
-#include <pdal/Bounds.hpp>
 
 #define SEPARATORS ",| "
 

diff --git a/plugins/oci/io/OciCommon.cpp b/plugins/oci/io/OciCommon.cpp
@@ -37,7 +37,6 @@
 
 #include <iostream>
 
-#include <pdal/Bounds.hpp>
 #include <pdal/Dimension.hpp>
 #include <pdal/Utils.hpp>
 #include <pdal/FileUtils.hpp>

diff --git a/plugins/oci/io/OciWriter.cpp b/plugins/oci/io/OciWriter.cpp
@@ -33,7 +33,6 @@
 ****************************************************************************/
 
 
-#include <pdal/Bounds.hpp>
 #include <pdal/FileUtils.hpp>
 #include <pdal/PointBuffer.hpp>
 #include <pdal/StageFactory.hpp>

diff --git a/plugins/oci/io/OciWriter.hpp b/plugins/oci/io/OciWriter.hpp
@@ -35,7 +35,6 @@
 #pragma once
 
 #include <pdal/DbWriter.hpp>
-#include <pdal/Bounds.hpp>
 #include <pdal/GDALUtils.hpp>
 
 pdal::Writer* createOciWriter();

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -15,8 +15,7 @@
 #   PDAL_<dirname>_CPP - all the .cpp files for the given subdir/namespace
 #   ...
 
-set(PDAL_HEADERS_DIR "${PROJECT_SOURCE_DIR}/include/pdal")
-set(PDAL_UTIL_DIR "${PROJECT_SOURCE_DIR}/util")
+
 set(PDAL_HPP "")
 set(PDAL_CPP "")
 

diff --git a/src/SpatialReference.cpp b/src/SpatialReference.cpp
@@ -34,7 +34,6 @@
 
 #include <pdal/SpatialReference.hpp>
 #include <pdal/PDALUtils.hpp>
-#include <pdal/Bounds.hpp>
 
 #include <boost/algorithm/string/trim.hpp>
 

diff --git a/test/unit/BoundsTest.cpp b/test/unit/BoundsTest.cpp
@@ -36,7 +36,7 @@
 
 #include <boost/property_tree/xml_parser.hpp>
 
-#include <pdal/Bounds.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/PDALUtils.hpp>
 
 using namespace pdal;

diff --git a/test/unit/Support.hpp b/test/unit/Support.hpp
@@ -36,7 +36,7 @@
 
 // support functions for unit testing
 
-#include <pdal/Bounds.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/Utils.hpp>
 
 namespace pdal

diff --git a/test/unit/io/faux/FauxReaderTest.cpp b/test/unit/io/faux/FauxReaderTest.cpp
@@ -35,7 +35,6 @@
 #include "gtest/gtest.h"
 
 #include <FauxReader.hpp>
-#include <pdal/Bounds.hpp>
 
 using namespace pdal;
 

diff --git a/tools/lasdump/Header.hpp b/tools/lasdump/Header.hpp
@@ -38,7 +38,7 @@
 
 #include <boost/uuid/uuid_generators.hpp>
 
-#include <pdal/Bounds.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/IStream.hpp>
 
 namespace pdal
@@ -166,7 +166,7 @@ class Header
 
     /// Set number of bytes from the beginning to the first point record.
     /// \param  offset - Offset to start of point data.
-    void setPointOffset(uint32_t offset) 
+    void setPointOffset(uint32_t offset)
           { m_pointOffset = offset; }
 
     /// Set the point format.

diff --git a/util/Bounds.cpp b/util/Bounds.cpp
@@ -36,7 +36,7 @@
 #include <limits>
 #include <vector>
 
-#include "Bounds.hpp"
+#include <pdal/util/Bounds.hpp>
 
 namespace
 {

diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
@@ -7,7 +7,7 @@ if(EXISTS)
 endif()
 
 set(PDAL_UTIL_HPP
-    "${PDAL_UTIL_DIR}/Bounds.hpp")
+    "${PDAL_HEADERS_DIR}/util/Bounds.hpp")
 
 set(PDAL_UTIL_CPP
     "${PDAL_UTIL_DIR}/Bounds.cpp")