From f33802880297af07533edac7dff8ebdbb5ce5dcf Mon Sep 17 00:00:00 2001 From: artemp Date: Mon, 28 Jul 2014 17:50:44 +0100 Subject: [PATCH] fix init order --- include/mapnik/text/text_properties.hpp | 9 ++++----- src/text/text_properties.cpp | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/mapnik/text/text_properties.hpp b/include/mapnik/text/text_properties.hpp index b51f86cd5..e0854b900 100644 --- a/include/mapnik/text/text_properties.hpp +++ b/include/mapnik/text/text_properties.hpp @@ -71,6 +71,9 @@ struct MAPNIK_DECL format_properties format_properties const& dfl = format_properties()) const; // collect expressions void add_expressions(expression_set & output) const; + + std::string face_name; + boost::optional fontset; // expressions symbolizer_base::value_type text_size; symbolizer_base::value_type character_spacing; @@ -78,14 +81,10 @@ struct MAPNIK_DECL format_properties symbolizer_base::value_type text_opacity; symbolizer_base::value_type halo_opacity; symbolizer_base::value_type wrap_char; - symbolizer_base::value_type halo_radius; symbolizer_base::value_type fill; symbolizer_base::value_type halo_fill; + symbolizer_base::value_type halo_radius; symbolizer_base::value_type text_transform; - // - - std::string face_name; - boost::optional fontset; }; diff --git a/src/text/text_properties.cpp b/src/text/text_properties.cpp index aaed0964e..623c98d3b 100644 --- a/src/text/text_properties.cpp +++ b/src/text/text_properties.cpp @@ -274,10 +274,10 @@ format_properties::format_properties() text_opacity(1.0), halo_opacity(1.0), wrap_char(" "), - text_transform(enumeration_wrapper(NONE)), fill(color(0,0,0)), halo_fill(color(255,255,255)), - halo_radius(0.0) {} + halo_radius(0.0), + text_transform(enumeration_wrapper(NONE)) {} void format_properties::from_xml(xml_node const& node, fontset_map const& fontsets) {