From 115342bbf89813aa9dabf9f30b129f8766a2ef91 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 7 Oct 2022 08:22:07 -0700 Subject: [PATCH] Fix compiler errors Using fixes described in https://github.com/mapnik/mapnik/issues/4243#issuecomment-1118604455 --- include/mapnik/agg_renderer.hpp | 1 + include/mapnik/cairo/cairo_renderer.hpp | 1 + include/mapnik/feature_style_processor.hpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp index d73ea3e8ee..1c5ba141dc 100644 --- a/include/mapnik/agg_renderer.hpp +++ b/include/mapnik/agg_renderer.hpp @@ -196,6 +196,7 @@ class MAPNIK_DECL agg_renderer : public feature_style_processor void setup(Map const& m, buffer_type& pixmap); }; +extern template class MAPNIK_DECL feature_style_processor>; extern template class MAPNIK_DECL agg_renderer>; } // namespace mapnik diff --git a/include/mapnik/cairo/cairo_renderer.hpp b/include/mapnik/cairo/cairo_renderer.hpp index 94bbec037f..9c7a645bf1 100644 --- a/include/mapnik/cairo/cairo_renderer.hpp +++ b/include/mapnik/cairo/cairo_renderer.hpp @@ -137,6 +137,7 @@ class MAPNIK_DECL cairo_renderer : public feature_style_processor>; extern template class MAPNIK_DECL cairo_renderer; } // namespace mapnik diff --git a/include/mapnik/feature_style_processor.hpp b/include/mapnik/feature_style_processor.hpp index a8047fd0ea..07f65a337e 100644 --- a/include/mapnik/feature_style_processor.hpp +++ b/include/mapnik/feature_style_processor.hpp @@ -47,7 +47,7 @@ struct layer_rendering_material; enum eAttributeCollectionPolicy { DEFAULT = 0, COLLECT_ALL = 1 }; template -class feature_style_processor +class MAPNIK_DECL feature_style_processor { public: explicit feature_style_processor(Map const& m, double scale_factor = 1.0);