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

fix skipping of empty text nodes in rapidxml parser (matches libxml2) - closes #2253

Browse source
This commit is contained in:
Dane Springmeyer 2014-05-23 10:27:37 -07:00
parent 9e03ace209
commit 3fc6e1282f
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/rapidxml_loader.cpp
View file

@ -143,7 +143,10 @@ private:
case rapidxml::node_data:
case rapidxml::node_cdata:
{
node.add_child(cur_node->value(), 0, true);
if (cur_node->value_size() > 0) // Don't add empty text nodes
{
node.add_child(cur_node->value(), 0, true);
}
}
break;
default:

15
tests/data/good_maps/empty_text_symbolizer.xml Normal file
View file

@ -0,0 +1,15 @@
<Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" background-color="steelblue" minimum-version="0.7.2">
<Style name="labels">
<Rule>
<TextSymbolizer face-name="DejaVu Sans Book"></TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book">''</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book"><![CDATA[]]></TextSymbolizer>
</Rule>
</Style>
<Layer name="point" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>labels</StyleName>
</Layer>
</Map>