Update C API point view iterators to return pdal::PointViewPtr

Author: jimmysoda

source/pdal/capi/PointViewCollection.cpp

@@ -18,9 +18,9 @@ namespace pdal
 			return (mItr != mViews.cend());
 		}
 
-		const pdal::PointView *PointViewCollection::next()
+		const pdal::PointViewPtr PointViewCollection::next()
 		{
-			return hasNext() ? (mItr++)->get() : nullptr;
+			return hasNext() ? *(mItr++) : nullptr;
 		}
 
 		void PointViewCollection::reset()
@@ -40,7 +40,19 @@ namespace pdal
 			PDALPointViewPtr PDALGetNextPointView(PDALPointViewCollectionPtr collection)
 			{
 				auto ptr = reinterpret_cast<pdal::capi::PointViewCollection *>(collection);
-				return ptr ? (PDALPointViewPtr) ptr->next() : nullptr;
+				PDALPointViewPtr view = nullptr;
+
+				if (ptr)
+				{
+					pdal::PointViewPtr v = ptr->next();
+
+					if (v)
+					{
+						view = new pdal::PointViewPtr(std::move(v));
+					}
+				}
+
+				return view;
 			}
 
 			void PDALResetPointViewCollection(PDALPointViewCollectionPtr collection)

source/pdal/capi/PointViewCollection.h

@@ -1,8 +1,8 @@
 /*
  * Copyright (c) Simverge Software LLC - All Rights Reserved
  */
-#ifndef PDAL_CAPI_POINTCLOUDVIEWCOLLECTION_H
-#define PDAL_CAPI_POINTCLOUDVIEWCOLLECTION_H
+#ifndef PDAL_CAPI_POINTVIEWCOLLECTION_H
+#define PDAL_CAPI_POINTVIEWCOLLECTION_H
 
 #include "Forward.h"
 
@@ -18,7 +18,7 @@ namespace pdal
 		public:
 			PointViewCollection(const pdal::PointViewSet& views);
 			bool hasNext() const;
-			const pdal::PointView *next();
+			const pdal::PointViewPtr next();
 			void reset();
 
 		private:

tests/pdal/capi/PointViewCollectionTest.c.in

@@ -13,6 +13,7 @@
 
 SUITE(PointViewCollectionTest);
 
+static PDALPipelinePtr gPipeline = NULL;
 static PDALPointViewCollectionPtr gPointViewCollection = NULL;
 
 static void setupPointViewCollectionTest(void *arg)
@@ -31,22 +32,25 @@ static void setupPointViewCollectionTest(void *arg)
 		{
 			fread(json, 1, length, file);
 			json[length] = '\0';
-		}
 
-		fclose(file);
-	}
+			gPipeline = PDALCreatePipeline(json);
 
-	PDALPipelinePtr pipeline = PDALCreatePipeline(json);
+			if (gPipeline && PDALExecutePipeline(gPipeline))
+			{
+				gPointViewCollection = PDALGetPointViews(gPipeline);
+			}
 
-	if (pipeline && PDALExecutePipeline(pipeline))
-	{
-		gPointViewCollection = PDALGetPointViews(pipeline);
+			free(json);
+		}
+
+		fclose(file);
 	}
 }
 
 static void teardownPointViewCollectionTest(void *arg)
 {
 	PDALDisposePointViewCollection(gPointViewCollection);
+	PDALDisposePipeline(gPipeline);
 }
 
 TEST testPDALHasNextPointView(void)
@@ -61,28 +65,35 @@ TEST testPDALHasNextPointView(void)
 	PASS();
 }
 
-TEST testPDALNextPointView(void)
+TEST testPDALGetNextPointView(void)
 {
+	PDALPointViewPtr view = PDALGetNextPointView(NULL);
+	ASSERT_EQ(NULL, view);
+
 	ASSERT_FALSE(gPointViewCollection == NULL);
+	PDALResetPointViewCollection(gPointViewCollection);
 	bool hasNext = PDALHasNextPointView(gPointViewCollection);
 	ASSERT_FALSE(!hasNext);
 
-	PDALPointViewPtr view = PDALGetNextPointView(gPointViewCollection);
+	view = PDALGetNextPointView(gPointViewCollection);
 	ASSERT_FALSE(view == NULL);
 
 	if (PDALHasNextPointView(gPointViewCollection))
 	{
 		PDALPointViewPtr anotherView = PDALGetNextPointView(gPointViewCollection);
 		ASSERT_FALSE(anotherView == NULL);
 		ASSERT_FALSE(anotherView == view);
+		PDALDisposePointView(anotherView);
 	}
 
+	PDALDisposePointView(view);
 	PASS();
 }
 
 TEST testPDALResetPointViewCollection(void)
 {
 	ASSERT_FALSE(gPointViewCollection == NULL);
+	PDALResetPointViewCollection(gPointViewCollection);
 	bool hasNext = PDALHasNextPointView(gPointViewCollection);
 	ASSERT_FALSE(!hasNext);
 
@@ -94,15 +105,20 @@ TEST testPDALResetPointViewCollection(void)
 		PDALPointViewPtr anotherView = PDALGetNextPointView(gPointViewCollection);
 		ASSERT_FALSE(anotherView == NULL);
 		ASSERT_FALSE(anotherView == view);
+		PDALDisposePointView(anotherView);
 	}
 
+	PDALDisposePointView(view);
+
 	view = PDALGetNextPointView(gPointViewCollection);
 	ASSERT_EQ(NULL, view);
+	PDALDisposePointView(view);
 
 	PDALResetPointViewCollection(gPointViewCollection);
 
 	view = PDALGetNextPointView(gPointViewCollection);
 	ASSERT_FALSE(view == NULL);
+	PDALDisposePointView(view);
 
 	PASS();
 }
@@ -113,7 +129,7 @@ GREATEST_SUITE(PointViewCollectionTest)
 	SET_TEARDOWN(teardownPointViewCollectionTest, NULL);
 
 	RUN_TEST(testPDALHasNextPointView);
-	RUN_TEST(testPDALNextPointView);
+	RUN_TEST(testPDALGetNextPointView);
 	RUN_TEST(testPDALResetPointViewCollection);
 
 	SET_SETUP(NULL, NULL);