FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Jean-Sebastien Guay, fix to handling of xml node with contents by not children

Browse Source
This commit is contained in:
Robert Osfield
2010-01-07 19:08:53 +00:00
parent 0e23193122
commit 182d6595a6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgDB/XmlParser.cpp
View File

@@ -295,7 +295,7 @@ bool XmlNode::read(Input& input)
}
}
if ((c=input[0])>=0 && c=='>' || c=='/')
if ((c=input[0])>=0 && (c=='>' || c=='/'))
{
++input;
@@ -309,7 +309,7 @@ bool XmlNode::read(Input& input)
osg::notify(osg::INFO)<<"tag is closed correctly"<<std::endl;
}
else
osg::notify(osg::NOTICE)<<"Error: end tag is not closed correctly"<<std::endl;
osg::notify(osg::NOTICE)<<"Error: tag is not closed correctly"<<std::endl;
}
else
{
@@ -401,7 +401,7 @@ bool XmlNode::write(std::ostream& fout) const
fout<<"\"";
}
if (children.empty())
if (children.empty() && contents.empty())
{
fout<<" />"<<std::endl;
}