Remove stuff from hexer that was necessary when it was its own package.

PDAL · Jul 2, 2018 · b99f4dc · b99f4dc
1 parent c5abf08
commit b99f4dc
Show file tree

Hide file tree

Showing 20 changed files with 92 additions and 355 deletions.
diff --git a/filters/HexBinFilter.cpp b/filters/HexBinFilter.cpp
@@ -108,7 +108,6 @@ void HexBin::done(PointTableRef table)
         m_metadata.add("boundary", "MULTIPOLYGON EMPTY",
             "Empty polygon -- unable to compute boundary");
         return;
-
     }
 
 

diff --git a/filters/HexBinFilter.hpp b/filters/HexBinFilter.hpp
@@ -42,8 +42,6 @@
 #include "private/hexer/HexGrid.hpp"
 #include "private/hexer/Processor.hpp"
 
-//namespace hexer = pdalhexer;
-
 namespace pdal
 {
 

diff --git a/filters/private/hexer/HexGrid.hpp b/filters/private/hexer/HexGrid.hpp
@@ -42,7 +42,6 @@
 #include "Mathpair.hpp"
 #include "Path.hpp"
 #include "Segment.hpp"
-#include "export.hpp"
 
 namespace hexer
 {
@@ -51,7 +50,7 @@ class HexIter;
 
 static const double SQRT_3 = 1.732050808;
 
-class HEXER_DLL HexGrid
+class HexGrid
 {
     friend class HexIter;
 public:

diff --git a/filters/private/hexer/HexInfo.hpp b/filters/private/hexer/HexInfo.hpp
@@ -36,7 +36,7 @@
 namespace hexer
 {
 
-class HEXER_DLL HexInfo
+class HexInfo
 {
 public:
     Point m_center;

diff --git a/filters/private/hexer/HexIter.hpp b/filters/private/hexer/HexIter.hpp
@@ -33,14 +33,13 @@
  ****************************************************************************/
 #pragma once
 
-#include "export.hpp"
 #include "HexGrid.hpp"
 #include "HexInfo.hpp"
 
 namespace hexer
 {
 
-class HEXER_DLL HexIter
+class HexIter
 {
 public:
     HexIter(HexGrid::HexMap::iterator iter, HexGrid *grid) :

diff --git a/filters/private/hexer/Hexagon.hpp b/filters/private/hexer/Hexagon.hpp
@@ -35,13 +35,12 @@
 
 #include <stdint.h>
 
-#include "export.hpp"
 #include "Mathpair.hpp"
 
 namespace hexer
 {
 
-class HEXER_DLL Hexagon
+class Hexagon
 {
 public:
     Hexagon(int x, int y) : m_x(x), m_y(y), m_count(0), m_dense(false),

diff --git a/filters/private/hexer/Mathpair.hpp b/filters/private/hexer/Mathpair.hpp
@@ -34,13 +34,11 @@
 
 #pragma once
 
-#include "export.hpp"
-
 namespace hexer
 {
 
 template <typename T>
-struct HEXER_DLL Mathpair
+struct Mathpair
 {
 public:
     Mathpair() : m_x(T(0)), m_y(T(0))

diff --git a/filters/private/hexer/Path.hpp b/filters/private/hexer/Path.hpp
@@ -38,7 +38,6 @@
 
 #include "Mathpair.hpp"
 #include "Segment.hpp"
-#include "export.hpp"
 
 namespace hexer
 {
@@ -51,7 +50,7 @@ enum Orientation
 
 class HexGrid;
 
-class HEXER_DLL Path
+class Path
 {
 public:
     Path(HexGrid *m_grid, Orientation orient) :

diff --git a/filters/private/hexer/Processor.cpp b/filters/private/hexer/Processor.cpp
@@ -40,10 +40,6 @@
 
 #include "HexGrid.hpp"
 
-#ifdef HEXER_HAVE_GDAL
-#include "gdal.h"
-#endif
-
 #include "Mathpair.hpp"
 
 namespace hexer
@@ -95,20 +91,4 @@ void processHexes(HexGrid *grid, HexReader reader)
     grid->findParentPaths();
 }
 
-std::string GetFullVersion( void )
-{
-    std::ostringstream os;
-
-    os << "hexer "
-       << HEXER_VERSION_MAJOR << "."
-       << HEXER_VERSION_MINOR << "."
-       << HEXER_VERSION_PATCH;
-
-#ifdef HEXER_HAVE_GDAL
-    os << " with GDAL " << GDALVersionInfo("RELEASE_NAME");
-#endif
-
-    return os.str();
-}
-
 } //namespace hexer
diff --git a/filters/private/hexer/Processor.hpp b/filters/private/hexer/Processor.hpp
@@ -39,19 +39,15 @@
 #include <functional>
 
 #include "Path.hpp"
-#include "export.hpp"
 
 namespace hexer
 {
     typedef std::function<bool(double&, double&, void*&)> PointReader;
     typedef std::function<bool(int&, int&, void*&)> HexReader;
 
-    HEXER_DLL void process(HexGrid *grid, PointReader);
-    HEXER_DLL void processHexes(HexGrid *grid, HexReader);
-
-    HEXER_DLL double computeHexSize(const std::vector<Point>& samples,
+    void process(HexGrid *grid, PointReader);
+    void processHexes(HexGrid *grid, HexReader);
+    double computeHexSize(const std::vector<Point>& samples,
         int density);
-
-    HEXER_DLL std::string GetFullVersion( void );
 } // namespace hexer
 
diff --git a/filters/private/hexer/Segment.hpp b/filters/private/hexer/Segment.hpp
@@ -38,15 +38,14 @@
 #include <vector>
 
 #include "Mathpair.hpp"
-#include "export.hpp"
 
 namespace hexer
 {
 
 class Hexagon;
 class HexGrid;
 
-class HEXER_DLL Segment
+class Segment
 {
 public:
     Segment() : m_hex(NULL), m_side(0)

diff --git a/filters/private/hexer/Utils.hpp b/filters/private/hexer/Utils.hpp
diff --git a/filters/private/hexer/export.hpp b/filters/private/hexer/export.hpp
diff --git a/filters/private/hexer/gitsha.cpp b/filters/private/hexer/gitsha.cpp
diff --git a/filters/private/hexer/gitsha.h b/filters/private/hexer/gitsha.h
diff --git a/filters/private/hexer/hexer.hpp b/filters/private/hexer/hexer.hpp