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

after #1483 fontset is boost optional so check appropriately in load_map (solves assert)

Browse source
This commit is contained in:
Dane Springmeyer 2012-09-26 12:56:57 -07:00
parent 7d066fe8f7
commit b9b97ba652
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/load_map.cpp
View file

@ -1135,7 +1135,7 @@ void map_parser::parse_text_symbolizer(rule & rule, xml_node const& sym)
placement_finder->defaults.from_xml(sym, fontsets_); placement_finder->defaults.from_xml(sym, fontsets_);
} }
if (strict_ && if (strict_ &&
!placement_finder->defaults.format.fontset->size()) !placement_finder->defaults.format.fontset)
{ {
ensure_font_face(placement_finder->defaults.format.face_name); ensure_font_face(placement_finder->defaults.format.face_name);
} }
@ -1164,7 +1164,7 @@ void map_parser::parse_shield_symbolizer(rule & rule, xml_node const& sym)
} }
placement_finder->defaults.from_xml(sym, fontsets_); placement_finder->defaults.from_xml(sym, fontsets_);
if (strict_ && if (strict_ &&
!placement_finder->defaults.format.fontset->size()) !placement_finder->defaults.format.fontset)
{ {
ensure_font_face(placement_finder->defaults.format.face_name); ensure_font_face(placement_finder->defaults.format.face_name);
} }