[python-mapnik] 01/04: Imported Upstream version 0.0~20150708-c005502
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Jul 9 06:53:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository python-mapnik.
commit dd61b9049aa4d5e2353d19e808f8d11b36754379
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jul 9 08:18:45 2015 +0200
Imported Upstream version 0.0~20150708-c005502
---
README.md | 25 +++++++++++++++++++++++++
setup.py | 8 +++++---
src/mapnik_color.cpp | 1 +
src/mapnik_coord.cpp | 1 +
src/mapnik_datasource.cpp | 1 +
src/mapnik_datasource_cache.cpp | 1 +
src/mapnik_envelope.cpp | 1 +
src/mapnik_expression.cpp | 1 +
src/mapnik_feature.cpp | 1 +
src/mapnik_featureset.cpp | 1 +
src/mapnik_font_engine.cpp | 1 +
src/mapnik_fontset.cpp | 1 +
src/mapnik_gamma_method.cpp | 1 +
src/mapnik_geometry.cpp | 1 +
src/mapnik_grid.cpp | 1 +
src/mapnik_grid_view.cpp | 1 +
src/mapnik_image.cpp | 7 ++++---
src/mapnik_image_view.cpp | 1 +
src/mapnik_label_collision_detector.cpp | 1 +
src/mapnik_layer.cpp | 1 +
src/mapnik_logger.cpp | 1 +
src/mapnik_map.cpp | 1 +
src/mapnik_palette.cpp | 1 +
src/mapnik_parameters.cpp | 1 +
src/mapnik_proj_transform.cpp | 1 +
src/mapnik_projection.cpp | 1 +
src/mapnik_python.cpp | 1 +
src/mapnik_query.cpp | 1 +
src/mapnik_raster_colorizer.cpp | 1 +
src/mapnik_rule.cpp | 1 +
src/mapnik_scaling_method.cpp | 1 +
src/mapnik_style.cpp | 1 +
src/mapnik_symbolizer.cpp | 1 +
src/mapnik_text_placement.cpp | 1 +
src/mapnik_view_transform.cpp | 1 +
src/python_grid_utils.cpp | 1 +
src/python_to_value.hpp | 1 +
37 files changed, 68 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 502d8c5..fa3ba46 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,14 @@ python setup.py develop
If you wish to are currently developing on mapnik-python and wish to change the code in place and immediately have python changes reflected in your environment.
+
+```
+python setup.py develop --uninstall
+```
+
+Will de-activate the development install by removing the `python-mapnik` entry from `site-packages/easy-install.pth`.
+
+
```
python setup.py install
```
@@ -50,3 +58,20 @@ python setup.py test
The test data in `./test/data` and `./test/data-visual` are standalone modules. If you need to update them see https://github.com/mapnik/mapnik/blob/master/docs/contributing.markdown#testing
+
+### Troubleshooting
+
+If you hit an error like:
+
+```
+Fatal Python error: PyThreadState_Get: no current thread
+Abort trap: 6
+```
+
+That means you likely have built python-mapnik is linked against a differ python version than what you are running. To solve this try running:
+
+```
+/usr/bin/python <your script.py>
+```
+
+If you still hit a problem create an issue and we'll try to help.
diff --git a/setup.py b/setup.py
index 2980471..85757e6 100755
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,9 @@ else:
mapnik_config = 'mapnik-config'
mason_build = False
-boost_python_lib = os.environ.get("BOOST_PYTHON_LIB", 'boost_python')
+boost_python_lib = os.environ.get("BOOST_PYTHON_LIB", 'boost_python-mt')
+boost_system_lib = os.environ.get("BOOST_SYSTEM_LIB", 'boost_system-mt')
+boost_thread_lib = os.environ.get("BOOST_THREAD_LIB", 'boost_thread-mt')
try:
linkflags = subprocess.check_output([mapnik_config, '--libs']).rstrip('\n').split(' ')
@@ -215,9 +217,9 @@ setup(
'mapnik',
'mapnik-wkt',
'mapnik-json',
- 'boost_thread',
- 'boost_system',
boost_python_lib,
+ boost_thread_lib,
+ boost_system_lib
],
extra_compile_args = extra_comp_args,
extra_link_args = linkflags,
diff --git a/src/mapnik_color.cpp b/src/mapnik_color.cpp
index 54f0c9a..4ab765e 100644
--- a/src/mapnik_color.cpp
+++ b/src/mapnik_color.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
diff --git a/src/mapnik_coord.cpp b/src/mapnik_coord.cpp
index 7c480f2..13b8961 100644
--- a/src/mapnik_coord.cpp
+++ b/src/mapnik_coord.cpp
@@ -27,6 +27,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
diff --git a/src/mapnik_datasource.cpp b/src/mapnik_datasource.cpp
index b11ecd7..41cd790 100644
--- a/src/mapnik_datasource.cpp
+++ b/src/mapnik_datasource.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
diff --git a/src/mapnik_datasource_cache.cpp b/src/mapnik_datasource_cache.cpp
index 7122468..5439991 100644
--- a/src/mapnik_datasource_cache.cpp
+++ b/src/mapnik_datasource_cache.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
diff --git a/src/mapnik_envelope.cpp b/src/mapnik_envelope.cpp
index 2104c4f..3964053 100644
--- a/src/mapnik_envelope.cpp
+++ b/src/mapnik_envelope.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
diff --git a/src/mapnik_expression.cpp b/src/mapnik_expression.cpp
index 0a07482..60c4a44 100644
--- a/src/mapnik_expression.cpp
+++ b/src/mapnik_expression.cpp
@@ -29,6 +29,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
diff --git a/src/mapnik_feature.cpp b/src/mapnik_feature.cpp
index a80ab15..16d9d17 100644
--- a/src/mapnik_feature.cpp
+++ b/src/mapnik_feature.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/iterator.hpp>
diff --git a/src/mapnik_featureset.cpp b/src/mapnik_featureset.cpp
index f239a78..8e9ddf6 100644
--- a/src/mapnik_featureset.cpp
+++ b/src/mapnik_featureset.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
diff --git a/src/mapnik_font_engine.cpp b/src/mapnik_font_engine.cpp
index e3a881f..dfc89f4 100644
--- a/src/mapnik_font_engine.cpp
+++ b/src/mapnik_font_engine.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
diff --git a/src/mapnik_fontset.cpp b/src/mapnik_fontset.cpp
index 9d109a7..651efd1 100644
--- a/src/mapnik_fontset.cpp
+++ b/src/mapnik_fontset.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
diff --git a/src/mapnik_gamma_method.cpp b/src/mapnik_gamma_method.cpp
index 9e6b478..c1849cc 100644
--- a/src/mapnik_gamma_method.cpp
+++ b/src/mapnik_gamma_method.cpp
@@ -27,6 +27,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
diff --git a/src/mapnik_geometry.cpp b/src/mapnik_geometry.cpp
index dee9de4..d2ec6c1 100644
--- a/src/mapnik_geometry.cpp
+++ b/src/mapnik_geometry.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/def.hpp>
diff --git a/src/mapnik_grid.cpp b/src/mapnik_grid.cpp
index c1f4b12..1147ac2 100644
--- a/src/mapnik_grid.cpp
+++ b/src/mapnik_grid.cpp
@@ -30,6 +30,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/module.hpp>
diff --git a/src/mapnik_grid_view.cpp b/src/mapnik_grid_view.cpp
index 2357c6b..230ccc0 100644
--- a/src/mapnik_grid_view.cpp
+++ b/src/mapnik_grid_view.cpp
@@ -30,6 +30,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/module.hpp>
diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp
index 6e6aeac..89ae397 100644
--- a/src/mapnik_image.cpp
+++ b/src/mapnik_image.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/module.hpp>
@@ -191,7 +192,7 @@ object get_pixel(mapnik::image_any const& im, unsigned x, unsigned y, bool get_c
void set_pixel_color(mapnik::image_any & im, unsigned x, unsigned y, mapnik::color const& c)
{
- if (x >= static_cast<int>(im.width()) && y >= static_cast<int>(im.height()))
+ if (x >= static_cast<unsigned>(im.width()) && y >= static_cast<unsigned>(im.height()))
{
PyErr_SetString(PyExc_IndexError, "invalid x,y for image dimensions");
boost::python::throw_error_already_set();
@@ -202,7 +203,7 @@ void set_pixel_color(mapnik::image_any & im, unsigned x, unsigned y, mapnik::col
void set_pixel_double(mapnik::image_any & im, unsigned x, unsigned y, double val)
{
- if (x >= static_cast<int>(im.width()) && y >= static_cast<int>(im.height()))
+ if (x >= static_cast<unsigned>(im.width()) && y >= static_cast<unsigned>(im.height()))
{
PyErr_SetString(PyExc_IndexError, "invalid x,y for image dimensions");
boost::python::throw_error_already_set();
@@ -213,7 +214,7 @@ void set_pixel_double(mapnik::image_any & im, unsigned x, unsigned y, double val
void set_pixel_int(mapnik::image_any & im, unsigned x, unsigned y, int val)
{
- if (x >= static_cast<int>(im.width()) && y >= static_cast<int>(im.height()))
+ if (x >= static_cast<unsigned>(im.width()) && y >= static_cast<unsigned>(im.height()))
{
PyErr_SetString(PyExc_IndexError, "invalid x,y for image dimensions");
boost::python::throw_error_already_set();
diff --git a/src/mapnik_image_view.cpp b/src/mapnik_image_view.cpp
index 07832fb..1086cda 100644
--- a/src/mapnik_image_view.cpp
+++ b/src/mapnik_image_view.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/module.hpp>
diff --git a/src/mapnik_label_collision_detector.cpp b/src/mapnik_label_collision_detector.cpp
index 9e5a6cb..0d7ab8f 100644
--- a/src/mapnik_label_collision_detector.cpp
+++ b/src/mapnik_label_collision_detector.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/module.hpp>
diff --git a/src/mapnik_layer.cpp b/src/mapnik_layer.cpp
index 0dad77c..9836a2b 100644
--- a/src/mapnik_layer.cpp
+++ b/src/mapnik_layer.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
diff --git a/src/mapnik_logger.cpp b/src/mapnik_logger.cpp
index 6a1689f..8fc7c32 100644
--- a/src/mapnik_logger.cpp
+++ b/src/mapnik_logger.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
diff --git a/src/mapnik_map.cpp b/src/mapnik_map.cpp
index 8797c04..3f3719f 100644
--- a/src/mapnik_map.cpp
+++ b/src/mapnik_map.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
diff --git a/src/mapnik_palette.cpp b/src/mapnik_palette.cpp
index 982dbdb..33bc23a 100644
--- a/src/mapnik_palette.cpp
+++ b/src/mapnik_palette.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
diff --git a/src/mapnik_parameters.cpp b/src/mapnik_parameters.cpp
index febf96a..fb58f3d 100644
--- a/src/mapnik_parameters.cpp
+++ b/src/mapnik_parameters.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
diff --git a/src/mapnik_proj_transform.cpp b/src/mapnik_proj_transform.cpp
index 8f25a90..c4b0091 100644
--- a/src/mapnik_proj_transform.cpp
+++ b/src/mapnik_proj_transform.cpp
@@ -29,6 +29,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
diff --git a/src/mapnik_projection.cpp b/src/mapnik_projection.cpp
index d194d56..15b62a6 100644
--- a/src/mapnik_projection.cpp
+++ b/src/mapnik_projection.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
diff --git a/src/mapnik_python.cpp b/src/mapnik_python.cpp
index b4c4c3b..3cc80cc 100644
--- a/src/mapnik_python.cpp
+++ b/src/mapnik_python.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include "python_to_value.hpp"
#include <boost/python/args.hpp> // for keywords, arg, etc
#include <boost/python/converter/from_python.hpp>
diff --git a/src/mapnik_query.cpp b/src/mapnik_query.cpp
index 0172abe..8d77eef 100644
--- a/src/mapnik_query.cpp
+++ b/src/mapnik_query.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include "python_to_value.hpp"
#include <boost/python.hpp>
diff --git a/src/mapnik_raster_colorizer.cpp b/src/mapnik_raster_colorizer.cpp
index 833ba6f..a57d2d6 100644
--- a/src/mapnik_raster_colorizer.cpp
+++ b/src/mapnik_raster_colorizer.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
diff --git a/src/mapnik_rule.cpp b/src/mapnik_rule.cpp
index a9210ee..b319597 100644
--- a/src/mapnik_rule.cpp
+++ b/src/mapnik_rule.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/implicit.hpp>
diff --git a/src/mapnik_scaling_method.cpp b/src/mapnik_scaling_method.cpp
index cdb8b34..24522bb 100644
--- a/src/mapnik_scaling_method.cpp
+++ b/src/mapnik_scaling_method.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
diff --git a/src/mapnik_style.cpp b/src/mapnik_style.cpp
index 1ddff2d..da0f47b 100644
--- a/src/mapnik_style.cpp
+++ b/src/mapnik_style.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
diff --git a/src/mapnik_symbolizer.cpp b/src/mapnik_symbolizer.cpp
index 4bd03f8..4195494 100644
--- a/src/mapnik_symbolizer.cpp
+++ b/src/mapnik_symbolizer.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/suite/indexing/map_indexing_suite.hpp>
diff --git a/src/mapnik_text_placement.cpp b/src/mapnik_text_placement.cpp
index 468a70f..7bab210 100644
--- a/src/mapnik_text_placement.cpp
+++ b/src/mapnik_text_placement.cpp
@@ -28,6 +28,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#include <boost/python/stl_iterator.hpp>
diff --git a/src/mapnik_view_transform.cpp b/src/mapnik_view_transform.cpp
index ee81914..8dc177c 100644
--- a/src/mapnik_view_transform.cpp
+++ b/src/mapnik_view_transform.cpp
@@ -27,6 +27,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
diff --git a/src/python_grid_utils.cpp b/src/python_grid_utils.cpp
index ec4c321..62dba2b 100644
--- a/src/python_grid_utils.cpp
+++ b/src/python_grid_utils.cpp
@@ -29,6 +29,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
diff --git a/src/python_to_value.hpp b/src/python_to_value.hpp
index 6ad9250..89ac66d 100644
--- a/src/python_to_value.hpp
+++ b/src/python_to_value.hpp
@@ -27,6 +27,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mapnik.git
More information about the Pkg-grass-devel
mailing list