This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-mapnik.
commit 9309a7b59ece1aa045d7b03c2658ca95fc3ee05c Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Aug 10 13:35:33 2016 +0200 Imported Upstream version 0.0~20160809-7258eea --- .travis.yml | 1 - scripts/setup_mason.sh | 2 +- src/mapnik_datasource.cpp | 6 ++++-- src/mapnik_feature.cpp | 4 ++-- src/mapnik_featureset.cpp | 4 ++-- src/mapnik_geometry.cpp | 4 +++- src/mapnik_image.cpp | 3 ++- src/mapnik_layer.cpp | 2 +- .../support/mapnik-marker-ellipse-render1.png | Bin 15850 -> 15077 bytes .../support/mapnik-marker-ellipse-render2.png | Bin 13992 -> 13978 bytes 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5869479..413d70b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,6 @@ before_install: - | if [[ $(uname -s) == 'Linux' ]]; then export LDSHARED=$(python -c "import os;from distutils import sysconfig;print sysconfig.get_config_var('LDSHARED').replace('cc ','clang++-3.8 ')"); - mason install clang 3.8.0 ./.mason/mason install clang 3.8.0 export PATH=$(./.mason/mason prefix clang 3.8.0)/bin:${PATH} which clang++ diff --git a/scripts/setup_mason.sh b/scripts/setup_mason.sh index 1072283..e867b7d 100755 --- a/scripts/setup_mason.sh +++ b/scripts/setup_mason.sh @@ -4,7 +4,7 @@ set -eu set -o pipefail # we pin the mason version to avoid changes in mason breaking builds -MASON_VERSION="better-linking" +MASON_VERSION="3ddc419" function setup_mason() { if [[ ! -d ./.mason ]]; then diff --git a/src/mapnik_datasource.cpp b/src/mapnik_datasource.cpp index c0b2749..e888deb 100644 --- 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,std::shared_ptr<datasource>, - boost::noncopyable>("Datasource",no_init) + class_<datasource, + boost::noncopyable>("Datasource",no_init) .def("type",&datasource::type) .def("geometry_type",&datasource::get_geometry_type) .def("describe",&describe) @@ -196,6 +196,8 @@ void export_datasource() .def(self == self) ; + register_ptr_to_python<std::shared_ptr<datasource> >(); + def("CreateDatasource",&create_datasource); class_<memory_datasource, diff --git a/src/mapnik_feature.cpp b/src/mapnik_feature.cpp index e8f1fbc..cd0a15b 100644 --- a/src/mapnik_feature.cpp +++ b/src/mapnik_feature.cpp @@ -211,8 +211,7 @@ void export_feature() .def("push", &context_type::push) ; - class_<mapnik::feature_impl,std::shared_ptr<mapnik::feature_impl>, - boost::noncopyable>("Feature",init<context_ptr,mapnik::value_integer>("Default ctor.")) + class_<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>()), @@ -230,4 +229,5 @@ void export_feature() .def("from_geojson",from_geojson_impl) .staticmethod("from_geojson") ; + register_ptr_to_python<std::shared_ptr<mapnik::feature_impl> >(); } diff --git a/src/mapnik_featureset.cpp b/src/mapnik_featureset.cpp index 521beab..b4ab247 100644 --- a/src/mapnik_featureset.cpp +++ b/src/mapnik_featureset.cpp @@ -56,11 +56,11 @@ void export_featureset() { using namespace boost::python; // Featureset implements Python iterator interface - class_<mapnik::Featureset, std::shared_ptr<mapnik::Featureset>, - boost::noncopyable>("Featureset", no_init) + class_<mapnik::Featureset, boost::noncopyable>("Featureset", no_init) .def("__iter__", pass_through) .def("__next__", next) // Python2 support .def("next", next) ; + register_ptr_to_python<std::shared_ptr<mapnik::Featureset> >(); } diff --git a/src/mapnik_geometry.cpp b/src/mapnik_geometry.cpp index 1181c06..18f7dae 100644 --- 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>, std::shared_ptr<geometry<double> >, boost::noncopyable>("Geometry",no_init) + class_<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,4 +282,6 @@ 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 index 80aebcb..4b10384 100644 --- 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,std::shared_ptr<image_any>, boost::noncopyable >("Image","This class represents a image.",init<int,int>()) + class_<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>()) @@ -467,5 +467,6 @@ void export_image() .staticmethod("from_cairo") #endif ; + register_ptr_to_python<std::shared_ptr<image_any> >(); } diff --git a/src/mapnik_layer.cpp b/src/mapnik_layer.cpp index 671cc90..a7caf38 100644 --- a/src/mapnik_layer.cpp +++ b/src/mapnik_layer.cpp @@ -296,7 +296,7 @@ void export_layer() .add_property("minimum_scale_denominator", &layer::minimum_scale_denominator, &layer::set_minimum_scale_denominator, - "Get/Set the minimum scale demoninator of the layer.\n" + "Get/Set the minimum scale denominator of the layer.\n" "\n" "Usage:\n" ">>> from mapnik import Layer\n" diff --git a/test/python_tests/images/support/mapnik-marker-ellipse-render1.png b/test/python_tests/images/support/mapnik-marker-ellipse-render1.png index 7854c56..43ee304 100644 Binary files a/test/python_tests/images/support/mapnik-marker-ellipse-render1.png and b/test/python_tests/images/support/mapnik-marker-ellipse-render1.png differ diff --git a/test/python_tests/images/support/mapnik-marker-ellipse-render2.png b/test/python_tests/images/support/mapnik-marker-ellipse-render2.png index c2a4963..ab1c431 100644 Binary files a/test/python_tests/images/support/mapnik-marker-ellipse-render2.png and b/test/python_tests/images/support/mapnik-marker-ellipse-render2.png differ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mapnik.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel