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

fix svg parser to ignore empty groups - closes #1944

Browse source
This commit is contained in:
Dane Springmeyer 2013-07-10 17:25:34 -04:00
parent 022dd43834
commit 86bc7d6c11
6 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/svg/svg_parser.cpp
View file

@ -201,8 +201,11 @@ void start_element(svg_parser & parser, xmlTextReaderPtr reader)
if (xmlStrEqual(name, BAD_CAST "g"))
{
parser.path_.push_attr();
parse_attr(parser,reader);
if (xmlTextReaderIsEmptyElement(reader) == 0)
{
parser.path_.push_attr();
parse_attr(parser,reader);
}
}
else
{

8
tests/visual_tests/grids/marker-svg-empty-g-element-500-100-1.0-grid-reference.json
View file

@ -13,16 +13,16 @@
" ",
" ",
" ",
" !! ",
" ",
" ",
" ",
" !! ",
" !!!! ",
" !!!! ",
" !!!! ",
" ",
" ",
" !! ",
" !! ",
" !! ",
" ",
" ",
" ",
" ",

BIN
tests/visual_tests/images/marker-svg-empty-g-element-500-100-1.0-agg-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 360 B

After

Width:  |  Height:  |  Size: 270 B

BIN
tests/visual_tests/images/marker-svg-empty-g-element-500-100-1.0-cairo-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 437 B

After

Width:  |  Height:  |  Size: 281 B

BIN
tests/visual_tests/images/marker-svg-empty-g-element-500-100-2.0-agg-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 652 B

After

Width:  |  Height:  |  Size: 424 B

BIN
tests/visual_tests/images/marker-svg-empty-g-element-500-100-2.0-cairo-reference.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 724 B

After

Width:  |  Height:  |  Size: 525 B