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

This commit is contained in:
Dane Springmeyer 2012-09-26 12:56:57 -07:00
parent 7d066fe8f7
commit b9b97ba652

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_);
}
if (strict_ &&
!placement_finder->defaults.format.fontset->size())
!placement_finder->defaults.format.fontset)
{
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_);
if (strict_ &&
!placement_finder->defaults.format.fontset->size())
!placement_finder->defaults.format.fontset)
{
ensure_font_face(placement_finder->defaults.format.face_name);
}