Merge pull request #766 from matthewhanson/fix_p2g_radius

changed parameter m_RADIUS_SQ to m_RADIUS then pass in the square to Out...
PDAL · Feb 18, 2015 · 1c6683b · 1c6683b
2 parents 7421cf6 + db90c56
commit 1c6683b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plugins/p2g/io/P2gWriter.cpp b/plugins/p2g/io/P2gWriter.cpp
@@ -51,7 +51,7 @@ void P2gWriter::processOptions(const Options& options)
 {
     m_GRID_DIST_X = options.getValueOrDefault<double>("grid_dist_x", 6.0);
     m_GRID_DIST_Y = options.getValueOrDefault<double>("grid_dist_y", 6.0);
-    m_RADIUS_SQ = options.getValueOrDefault<double>("radius",
+    m_RADIUS = options.getValueOrDefault<double>("radius",
         8.4852813742385713);
     m_fill_window_size = options.getValueOrDefault<uint32_t>(
         "fill_window_size", 3);
@@ -165,7 +165,7 @@ void P2gWriter::write(const PointBuffer& buf)
                                        m_GRID_DIST_Y,
                                        m_GRID_SIZE_X,
                                        m_GRID_SIZE_Y,
-                                       m_RADIUS_SQ,
+                                       m_RADIUS * m_RADIUS,
                                        m_bounds.minx,
                                        m_bounds.maxx,
                                        m_bounds.miny,

diff --git a/plugins/p2g/io/P2gWriter.hpp b/plugins/p2g/io/P2gWriter.hpp
@@ -92,7 +92,7 @@ class PDAL_DLL P2gWriter : public pdal::Writer
     double m_GRID_DIST_X;
     double m_GRID_DIST_Y;
 
-    double m_RADIUS_SQ;
+    double m_RADIUS;
     unsigned int m_outputTypes;
     uint32_t m_fill_window_size;
     BOX3D m_bounds;