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

Reordered the readAllDataIntoBuffer() to avoid bug in failing on all calls to readXmlParser(..)

Browse Source
This commit is contained in:
Robert Osfield
2010-01-07 09:11:42 +00:00
parent 170ed5c9df
commit 6902390d87
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

@@ -25,13 +25,14 @@ XmlNode* osgDB::readXmlFile(const std::string& filename,const Options* options)
{
XmlNode::Input input;
input.open(foundFile);
input.readAllDataIntoBuffer();
if (!input)
{
osg::notify(osg::NOTICE)<<"Could not open XML file: "<<filename<<std::endl;
return 0;
}
input.readAllDataIntoBuffer();
osg::ref_ptr<XmlNode> root = new XmlNode;
root->read(input);
@@ -63,14 +64,13 @@ XmlNode* osgDB::readXmlStream(std::istream& fin)
{
XmlNode::Input input;
input.attach(fin);
input.readAllDataIntoBuffer();
if (!input)
{
osg::notify(osg::NOTICE)<<"Could not attach to XML stream."<<std::endl;
return 0;
}
input.readAllDataIntoBuffer();
osg::ref_ptr<XmlNode> root = new XmlNode;
root->read(input);