From a1ffbe1ec8bb6c1561f1f3e9720b987ca3eccefc Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 10 Mar 2016 12:58:29 -0800 Subject: [PATCH] suppress warnings from image_io libs --- include/mapnik/png_io.hpp | 8 +++++--- include/mapnik/tiff_io.hpp | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/mapnik/png_io.hpp b/include/mapnik/png_io.hpp index 35a5caed0..051ea6b4e 100644 --- a/include/mapnik/png_io.hpp +++ b/include/mapnik/png_io.hpp @@ -29,17 +29,19 @@ #include #include +#pragma GCC diagnostic push +#include + // zlib #include // for Z_DEFAULT_COMPRESSION -// boost - - extern "C" { #include } +#pragma GCC diagnostic pop + #define MAX_OCTREE_LEVELS 4 namespace mapnik { diff --git a/include/mapnik/tiff_io.hpp b/include/mapnik/tiff_io.hpp index df2b25a7a..b80142906 100644 --- a/include/mapnik/tiff_io.hpp +++ b/include/mapnik/tiff_io.hpp @@ -28,6 +28,9 @@ #include #include +#pragma GCC diagnostic push +#include + extern "C" { #include @@ -35,6 +38,9 @@ extern "C" #define RealTIFFClose TIFFClose } +#pragma GCC diagnostic pop + + //std #include