archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

fix init order

Browse Source
This commit is contained in:
artemp 2014-07-28 17:50:44 +01:00
parent 0cf6e47006
commit f338028802
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/mapnik/text/text_properties.hpp
View File

@ -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<font_set> 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<font_set> fontset;
};

4
src/text/text_properties.cpp
View File

@ -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)
{