Revert "Revert "make the PointBuffer that the pdal::Writer uses heap-…

…allocated and owned by the pdal::Writer instance. Add a public method to fetch it so that others may get the properties of the writer's PointBuffer""

This reverts commit e800967.

include/pdal/Writer.hpp

@@ -52,7 +52,7 @@ class PDAL_DLL Writer : public StageBase
 {
 public:
     Writer(Stage& prevStage, const Options& options);
-    virtual ~Writer() {}
+    virtual ~Writer();
 
     virtual void initialize();
 
@@ -76,6 +76,7 @@ class PDAL_DLL Writer : public StageBase
 
     // for dumping
     virtual boost::property_tree::ptree toPTree() const;
+    virtual PointBuffer const* getPointBuffer() const { return m_buffer; }
 
     static const boost::uint32_t s_defaultChunkSize = 1048576;
 
@@ -102,6 +103,7 @@ class PDAL_DLL Writer : public StageBase
 
     SpatialReference m_spatialReference;
     UserCallback* m_userCallback;
+    PointBuffer* m_buffer;
 
     Writer& operator=(const Writer&); // not implemented
     Writer(const Writer&); // not implemented

src/Writer.cpp

@@ -54,6 +54,7 @@ Writer::Writer(Stage& prevStage, const Options& options)
     : StageBase(StageBase::makeVector(prevStage), options)
     , m_chunkSize(options.getValueOrDefault("chunk_size", s_defaultChunkSize))
     , m_userCallback(0)
+    , m_buffer(0)
 {
     return;
 }
@@ -66,6 +67,12 @@ void Writer::initialize()
     return;
 }
 
+Writer::~Writer()
+{
+    if (m_buffer != 0)
+        delete m_buffer;
+}
+
 
 void Writer::setChunkSize(boost::uint32_t chunkSize)
 {
@@ -153,9 +160,9 @@ boost::uint64_t Writer::write(  boost::uint64_t targetNumPointsToWrite,
     do_callback(0.0, callback);
 
     const Schema& schema = getPrevStage().getSchema();
-    PointBuffer buffer(schema, m_chunkSize);
+    m_buffer = new PointBuffer (schema, m_chunkSize);
 
-    boost::scoped_ptr<StageSequentialIterator> iter(getPrevStage().createSequentialIterator(buffer));
+    boost::scoped_ptr<StageSequentialIterator> iter(getPrevStage().createSequentialIterator(*m_buffer));
 
     if (startingPosition)
         iter->skip(startingPosition);
@@ -193,28 +200,28 @@ boost::uint64_t Writer::write(  boost::uint64_t targetNumPointsToWrite,
             const boost::uint32_t numPointsToReadThisChunk = static_cast<boost::uint32_t>(numPointsToReadThisChunk64);
 
             // we are reusing the buffer, so we may need to adjust the capacity for the last (and likely undersized) chunk
-            if (buffer.getCapacity() != numPointsToReadThisChunk)
+            if (m_buffer->getCapacity() != numPointsToReadThisChunk)
             {
-                buffer.resize(numPointsToReadThisChunk);
+                m_buffer->resize(numPointsToReadThisChunk);
             }
         }
 
         // read...
-        iter->readBufferBegin(buffer);
-        const boost::uint32_t numPointsReadThisChunk = iter->readBuffer(buffer);
-        iter->readBufferEnd(buffer);
+        iter->readBufferBegin(*m_buffer);
+        const boost::uint32_t numPointsReadThisChunk = iter->readBuffer(*m_buffer);
+        iter->readBufferEnd(*m_buffer);
 
-        assert(numPointsReadThisChunk == buffer.getNumPoints());
-        assert(numPointsReadThisChunk <= buffer.getCapacity());
+        assert(numPointsReadThisChunk == m_buffer->getNumPoints());
+        assert(numPointsReadThisChunk <= m_buffer->getCapacity());
 
         // have we reached the end yet?
         if (numPointsReadThisChunk == 0) break;
 
         // write...
-        writeBufferBegin(buffer);
-        const boost::uint32_t numPointsWrittenThisChunk = writeBuffer(buffer);
+        writeBufferBegin(*m_buffer);
+        const boost::uint32_t numPointsWrittenThisChunk = writeBuffer(*m_buffer);
         assert(numPointsWrittenThisChunk == numPointsReadThisChunk);
-        writeBufferEnd(buffer);
+        writeBufferEnd(*m_buffer);
 
         // update count
         actualNumPointsWritten += numPointsWrittenThisChunk;
@@ -228,7 +235,7 @@ boost::uint64_t Writer::write(  boost::uint64_t targetNumPointsToWrite,
         }
 
         // reset the buffer, so we can use it again
-        buffer.setNumPoints(0);
+        m_buffer->setNumPoints(0);
     }
 
     iter->readEnd();