Revert "only register pointer to python conversion once (ref mapnik#104)"

artemp · artemp · commit 8e13b1cc78f5 · 2016-08-10T11:00:54.000+01:00
This reverts commit 57941cc.
diff --git a/src/mapnik_datasource.cpp b/src/mapnik_datasource.cpp
@@ -180,8 +180,8 @@ void export_datasource()
         .value("Collection",mapnik::datasource_geometry_t::Collection)
         ;
 
-    class_<datasource,
-           boost::noncopyable>("Datasource",no_init)
+    class_<datasource,std::shared_ptr<datasource>,
+        boost::noncopyable>("Datasource",no_init)
         .def("type",&datasource::type)
         .def("geometry_type",&datasource::get_geometry_type)
         .def("describe",&describe)
@@ -195,7 +195,6 @@ void export_datasource()
              "These vary depending on the type of data source.")
         .def(self == self)
         ;
-
     register_ptr_to_python<std::shared_ptr<datasource> >();
 
     def("CreateDatasource",&create_datasource);
diff --git a/src/mapnik_feature.cpp b/src/mapnik_feature.cpp
@@ -211,7 +211,8 @@ void export_feature()
         .def("push", &context_type::push)
         ;
 
-    class_<mapnik::feature_impl, boost::noncopyable>("Feature",init<context_ptr,mapnik::value_integer>("Default ctor."))
+    class_<mapnik::feature_impl,std::shared_ptr<mapnik::feature_impl>,
+        boost::noncopyable>("Feature",init<context_ptr,mapnik::value_integer>("Default ctor."))
         .def("id",&mapnik::feature_impl::id)
         .add_property("geometry",
                       make_function(&mapnik::feature_impl::get_geometry,return_value_policy<reference_existing_object>()),
diff --git a/src/mapnik_featureset.cpp b/src/mapnik_featureset.cpp
@@ -56,7 +56,8 @@ void export_featureset()
 {
     using namespace boost::python;
     // Featureset implements Python iterator interface
-    class_<mapnik::Featureset, boost::noncopyable>("Featureset", no_init)
+    class_<mapnik::Featureset, std::shared_ptr<mapnik::Featureset>,
+           boost::noncopyable>("Featureset", no_init)
         .def("__iter__", pass_through)
         .def("__next__", next)
         // Python2 support
diff --git a/src/mapnik_geometry.cpp b/src/mapnik_geometry.cpp
@@ -259,7 +259,7 @@ void export_geometry()
         .def("to_wkt",&to_wkt_impl)
         ;
 
-    class_<geometry<double>, boost::noncopyable>("Geometry",no_init)
+    class_<geometry<double>, std::shared_ptr<geometry<double> >, boost::noncopyable>("Geometry",no_init)
         .def("envelope",&geometry_envelope_impl)
         .def("from_geojson", from_geojson_impl)
         .def("from_wkt", from_wkt_impl)
@@ -282,6 +282,5 @@ void export_geometry()
         //.def("to_svg",&to_svg)
         // TODO add other geometry_type methods
         ;
-
     register_ptr_to_python<std::shared_ptr<geometry<double>> >();
 }
diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp
@@ -389,7 +389,7 @@ void export_image()
         .value("gray64f", mapnik::image_dtype_gray64f)
         ;
 
-    class_<image_any, boost::noncopyable >("Image","This class represents a image.",init<int,int>())
+    class_<image_any,std::shared_ptr<image_any>, boost::noncopyable >("Image","This class represents a image.",init<int,int>())
         .def(init<int,int,mapnik::image_dtype>())
         .def(init<int,int,mapnik::image_dtype,bool>())
         .def(init<int,int,mapnik::image_dtype,bool,bool>())

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,8 @@ void export_feature()`
`211`	`211`	`.def("push", &context_type::push)`
`212`	`212`	`;`
`213`	`213`
`214`		`- class_<mapnik::feature_impl, boost::noncopyable>("Feature",init<context_ptr,mapnik::value_integer>("Default ctor."))`
	`214`	`+ class_<mapnik::feature_impl,std::shared_ptr<mapnik::feature_impl>,`
	`215`	`+ boost::noncopyable>("Feature",init<context_ptr,mapnik::value_integer>("Default ctor."))`
`215`	`216`	`.def("id",&mapnik::feature_impl::id)`
`216`	`217`	`.add_property("geometry",`
`217`	`218`	`make_function(&mapnik::feature_impl::get_geometry,return_value_policy<reference_existing_object>()),`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ void export_geometry()`
`259`	`259`	`.def("to_wkt",&to_wkt_impl)`
`260`	`260`	`;`
`261`	`261`
`262`		`- class_<geometry<double>, boost::noncopyable>("Geometry",no_init)`
	`262`	`+ class_<geometry<double>, std::shared_ptr<geometry<double> >, boost::noncopyable>("Geometry",no_init)`
`263`	`263`	`.def("envelope",&geometry_envelope_impl)`
`264`	`264`	`.def("from_geojson", from_geojson_impl)`
`265`	`265`	`.def("from_wkt", from_wkt_impl)`
`@@ -282,6 +282,5 @@ void export_geometry()`
`282`	`282`	`//.def("to_svg",&to_svg)`
`283`	`283`	`// TODO add other geometry_type methods`
`284`	`284`	`;`
`285`		`-`
`286`	`285`	`register_ptr_to_python<std::shared_ptr<geometry<double>> >();`
`287`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ void export_image()`
`389`	`389`	`.value("gray64f", mapnik::image_dtype_gray64f)`
`390`	`390`	`;`
`391`	`391`
`392`		`- class_<image_any, boost::noncopyable >("Image","This class represents a image.",init<int,int>())`
	`392`	`+ class_<image_any,std::shared_ptr<image_any>, boost::noncopyable >("Image","This class represents a image.",init<int,int>())`
`393`	`393`	`.def(init<int,int,mapnik::image_dtype>())`
`394`	`394`	`.def(init<int,int,mapnik::image_dtype,bool>())`
`395`	`395`	`.def(init<int,int,mapnik::image_dtype,bool,bool>())`