Remove StageIterator.

Remove iterator use from reader.
PDAL · Sep 9, 2014 · 417c10a · 417c10a
1 parent 936a911
commit 417c10a
Show file tree

Hide file tree

Showing 31 changed files with 8 additions and 798 deletions.
diff --git a/include/pdal/Reader.hpp b/include/pdal/Reader.hpp
@@ -36,18 +36,10 @@
 
 #include <pdal/Stage.hpp>
 #include <pdal/Options.hpp>
-#include <pdal/StageIterator.hpp>
 
 namespace pdal
 {
 
-//
-// supported options:
-//   <uint32>id
-//   <bool>debug
-//   <uint32>verbose
-//
-
 class PDAL_DLL Reader : public Stage
 {
 public:
@@ -64,11 +56,7 @@ class PDAL_DLL Reader : public Stage
     {
         PointBufferSet pbSet;
 
-        StageSequentialIterator *it = createSequentialIterator();
-        if (it)
-            it->read(*buffer);
-        else
-            read(*buffer, m_count);
+        read(*buffer, m_count);
         pbSet.insert(buffer);
         return pbSet;
     }

diff --git a/include/pdal/StageIterator.hpp b/include/pdal/StageIterator.hpp
diff --git a/include/pdal/drivers/bpf/BpfSeqIterator.hpp b/include/pdal/drivers/bpf/BpfSeqIterator.hpp
diff --git a/include/pdal/drivers/faux/Reader.hpp b/include/pdal/drivers/faux/Reader.hpp
@@ -35,7 +35,6 @@
 #pragma once
 
 #include <pdal/Reader.hpp>
-#include <pdal/StageIterator.hpp>
 
 namespace pdal
 {

diff --git a/include/pdal/drivers/icebridge/Reader.hpp b/include/pdal/drivers/icebridge/Reader.hpp
@@ -35,7 +35,6 @@
 #pragma once
 
 #include <pdal/Reader.hpp>
-#include <pdal/StageIterator.hpp>
 #include <pdal/Options.hpp>
 #include <pdal/Hdf5Handler.hpp>
 

diff --git a/include/pdal/drivers/las/Reader.hpp b/include/pdal/drivers/las/Reader.hpp
@@ -36,7 +36,6 @@
 
 #include <pdal/Reader.hpp>
 
-#include <pdal/StageIterator.hpp>
 #include <pdal/StreamFactory.hpp>
 #include <pdal/drivers/las/Support.hpp>
 #include <pdal/drivers/las/Header.hpp>

diff --git a/include/pdal/drivers/pcd/Reader.hpp b/include/pdal/drivers/pcd/Reader.hpp
@@ -36,7 +36,6 @@
 
 #include <pdal/PointBuffer.hpp>
 #include <pdal/Reader.hpp>
-#include <pdal/StageIterator.hpp>
 #include <pdal/drivers/pcd/Common.hpp>
 
 namespace pdal

diff --git a/include/pdal/drivers/qfit/Reader.hpp b/include/pdal/drivers/qfit/Reader.hpp
@@ -39,7 +39,6 @@
 #include <boost/detail/endian.hpp>
 
 #include <pdal/Reader.hpp>
-#include <pdal/StageIterator.hpp>
 #include <pdal/Options.hpp>
 
 #ifdef BOOST_LITTLE_ENDIAN

diff --git a/include/pdal/drivers/sbet/Reader.hpp b/include/pdal/drivers/sbet/Reader.hpp
@@ -37,7 +37,6 @@
 #include <pdal/IStream.hpp>
 #include <pdal/PointBuffer.hpp>
 #include <pdal/Reader.hpp>
-#include <pdal/StageIterator.hpp>
 #include <pdal/drivers/sbet/Common.hpp>
 
 namespace pdal

diff --git a/include/pdal/drivers/terrasolid/Reader.hpp b/include/pdal/drivers/terrasolid/Reader.hpp
@@ -35,7 +35,6 @@
 #pragma once
 
 #include <pdal/Reader.hpp>
-#include <pdal/StageIterator.hpp>
 #include <pdal/Options.hpp>
 
 #include <vector>

diff --git a/include/pdal/kernel/Delta.hpp b/include/pdal/kernel/Delta.hpp
@@ -36,7 +36,6 @@
 #define INCLUDED_PDAL_KERNEL_DELTA_HPP
 
 #include <pdal/Stage.hpp>
-#include <pdal/StageIterator.hpp>
 #include <pdal/FileUtils.hpp>
 #include <pdal/PointBuffer.hpp>
 #include <pdal/KDIndex.hpp>

diff --git a/include/pdal/kernel/Diff.hpp b/include/pdal/kernel/Diff.hpp
@@ -36,7 +36,6 @@
 #define INCLUDED_PDAL_KERNEL_DIFF_HPP
 
 #include <pdal/Stage.hpp>
-#include <pdal/StageIterator.hpp>
 #include <pdal/FileUtils.hpp>
 #include <pdal/PointBuffer.hpp>
 

diff --git a/include/pdal/kernel/Info.hpp b/include/pdal/kernel/Info.hpp
@@ -35,7 +35,6 @@
 #pragma once
 
 #include <pdal/Stage.hpp>
-#include <pdal/StageIterator.hpp>
 #include <pdal/FileUtils.hpp>
 #include <pdal/PointBuffer.hpp>
 #include <pdal/filters/Stats.hpp>

diff --git a/include/pdal/kernel/Pipeline.hpp b/include/pdal/kernel/Pipeline.hpp
@@ -36,13 +36,11 @@
 #define INCLUDED_PDAL_KERNEL_PIPELINE_HPP
 
 
-
 #include <pdal/PipelineReader.hpp>
 #include <pdal/PipelineManager.hpp>
 #include <pdal/PipelineWriter.hpp>
 #include <pdal/FileUtils.hpp>
 #include <pdal/PointBuffer.hpp>
-#include <pdal/StageIterator.hpp>
 
 #include "Application.hpp"