sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix font-name checking when font-set is available. Fixes #1064.

Browse source
This commit is contained in:
Hermann Kraus 2012-02-06 11:08:54 +01:00
parent 8366da08ee
commit 18d24983b6
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/load_map.cpp
View file

@ -1282,7 +1282,9 @@ void map_parser::parse_text_symbolizer( rule & rule, ptree const & sym )
} }
placement_finder->properties.from_xml(sym, fontsets_); placement_finder->properties.from_xml(sym, fontsets_);
if (strict_) ensure_font_face(placement_finder->properties.default_format.face_name); if (strict_ &&
!placement_finder->properties.default_format.fontset.size())
ensure_font_face(placement_finder->properties.default_format.face_name);
if (list) { if (list) {
ptree::const_iterator symIter = sym.begin(); ptree::const_iterator symIter = sym.begin();
ptree::const_iterator endSym = sym.end(); ptree::const_iterator endSym = sym.end();
@ -1296,7 +1298,9 @@ void map_parser::parse_text_symbolizer( rule & rule, ptree const & sym )
ensure_attrs(symIter->second, "TextSymbolizer/Placement", s_common.str()); ensure_attrs(symIter->second, "TextSymbolizer/Placement", s_common.str());
text_symbolizer_properties & p = list->add(); text_symbolizer_properties & p = list->add();
p.from_xml(symIter->second, fontsets_); p.from_xml(symIter->second, fontsets_);
if (strict_) ensure_font_face(p.default_format.face_name); if (strict_ &&
!p.default_format.fontset.size())
ensure_font_face(p.default_format.face_name);
} }
} }