From 7d8924921cb09f192d40b64e56323a2aaa270ebe Mon Sep 17 00:00:00 2001 From: Hermann Kraus Date: Fri, 20 Jan 2012 22:14:08 +0100 Subject: [PATCH] Fix header for ShieldSymbolizer (6efb7a863d). Add more default constructors. --- include/mapnik/shield_symbolizer.hpp | 2 ++ include/mapnik/symbolizer.hpp | 2 +- include/mapnik/text_symbolizer.hpp | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/mapnik/shield_symbolizer.hpp b/include/mapnik/shield_symbolizer.hpp index 847bff663..b5aaf94e8 100644 --- a/include/mapnik/shield_symbolizer.hpp +++ b/include/mapnik/shield_symbolizer.hpp @@ -36,6 +36,8 @@ namespace mapnik struct MAPNIK_DECL shield_symbolizer : public text_symbolizer, public symbolizer_with_image { + shield_symbolizer(text_placements_ptr placements = text_placements_ptr( + boost::make_shared())); shield_symbolizer(expression_ptr name, std::string const& face_name, float size, diff --git a/include/mapnik/symbolizer.hpp b/include/mapnik/symbolizer.hpp index 546c4c1fe..062b5b781 100644 --- a/include/mapnik/symbolizer.hpp +++ b/include/mapnik/symbolizer.hpp @@ -96,7 +96,7 @@ public: void set_opacity(float opacity); float get_opacity() const; protected: - symbolizer_with_image(path_expression_ptr filename); + symbolizer_with_image(path_expression_ptr filename = path_expression_ptr()); symbolizer_with_image(symbolizer_with_image const& rhs); path_expression_ptr image_filename_; float opacity_; diff --git a/include/mapnik/text_symbolizer.hpp b/include/mapnik/text_symbolizer.hpp index 8f853020b..c1ae0a8ca 100644 --- a/include/mapnik/text_symbolizer.hpp +++ b/include/mapnik/text_symbolizer.hpp @@ -45,6 +45,9 @@ struct MAPNIK_DECL text_symbolizer : public symbolizer_base { // Note - we do not use boost::make_shared below as VC2008 and VC2010 are // not able to compile make_shared used within a constructor + text_symbolizer(text_placements_ptr placements = text_placements_ptr( + boost::make_shared()) + ); text_symbolizer(expression_ptr name, std::string const& face_name, float size, color const& fill, text_placements_ptr placements = text_placements_ptr(new text_placements_dummy)