From 6902390d873fb62d8ee292228f46682d59c4716e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 7 Jan 2010 09:11:42 +0000 Subject: [PATCH] Reordered the readAllDataIntoBuffer() to avoid bug in failing on all calls to readXmlParser(..) --- src/osgDB/XmlParser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgDB/XmlParser.cpp b/src/osgDB/XmlParser.cpp index 0867d38b4..81ec3b392 100644 --- a/src/osgDB/XmlParser.cpp +++ b/src/osgDB/XmlParser.cpp @@ -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: "< 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."< root = new XmlNode; root->read(input);