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

Fixed handling of space after = in options set up.

Browse Source
This commit is contained in:
Robert Osfield
2009-05-13 15:05:23 +00:00
parent 41b6c4dde8
commit 2e73fb2131
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgDB/XmlParser
View File

@@ -80,6 +80,8 @@ class OSGDB_EXPORT XmlNode : public osg::Referenced
operator bool () const { return _currentPos<_buffer.size(); }
size_type currentPosition() const { return _currentPos; }
int get() { if (_currentPos<_buffer.size()) return _buffer[_currentPos++]; else return -1; }
int operator [] (size_type i) const { if ((_currentPos+i)<_buffer.size()) return _buffer[_currentPos+i]; else return -1; }

18
src/osgDB/XmlParser.cpp
View File

@@ -120,7 +120,12 @@ void XmlNode::Input::readAllDataIntoBuffer()
void XmlNode::Input::skipWhiteSpace()
{
while(_currentPos<_buffer.size() && _buffer[_currentPos]==' ') ++_currentPos;
while(_currentPos<_buffer.size() && _buffer[_currentPos]==' ')
{
// osg::notify(osg::NOTICE)<<"_currentPos="<<_currentPos<<"_buffer.size()="<<_buffer.size()<<" v="<<_buffer[_currentPos]<<std::endl;
++_currentPos;
}
//osg::notify(osg::NOTICE)<<"done"<<std::endl;
}
XmlNode::XmlNode()
@@ -215,6 +220,8 @@ bool XmlNode::read(Input& input)
while ((c=input[0])>=0 && c!='>')
{
Input::size_type prev_pos = input.currentPosition();
input.skipWhiteSpace();
std::string option;
std::string value;
@@ -227,6 +234,9 @@ bool XmlNode::read(Input& input)
if (input[0]=='=')
{
++input;
input.skipWhiteSpace();
if (input[0]=='"')
{
++input;
@@ -258,6 +268,12 @@ bool XmlNode::read(Input& input)
}
}
if (prev_pos == input.currentPosition())
{
osg::notify(osg::NOTICE)<<"Error, parser iterator note advanced, position: "<<input.substr(0,50)<<std::endl;
++input;
}
if (!option.empty())
{
osg::notify(osg::INFO)<<"Assigning option "<<option<<" with value "<<value<<std::endl;