From 7bcfb3c130843e1bed0fcfbc903213676b2a9f81 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 27 Oct 2011 09:24:34 +0000 Subject: [PATCH] Added support for ignore returns as white space. --- src/osgDB/XmlParser.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osgDB/XmlParser.cpp b/src/osgDB/XmlParser.cpp index 1f64b4624..5800e1e97 100644 --- a/src/osgDB/XmlParser.cpp +++ b/src/osgDB/XmlParser.cpp @@ -136,9 +136,9 @@ void XmlNode::Input::readAllDataIntoBuffer() void XmlNode::Input::skipWhiteSpace() { - while(_currentPos<_buffer.size() && (_buffer[_currentPos]==' ' || _buffer[_currentPos]=='\t')) + while(_currentPos<_buffer.size() && (_buffer[_currentPos]==' ' || _buffer[_currentPos]=='\t' || _buffer[_currentPos]=='\n' || _buffer[_currentPos]=='\r')) { - // OSG_NOTICE<<"_currentPos="<<_currentPos<<"_buffer.size()="<<_buffer.size()<<" v="<<_buffer[_currentPos]<=0 && c!=' ' && c!='>' && c!='/') + while ((c=input[0])>=0 && c!=' ' && c!='\n' && c!='\r' && c!='>' && c!='/') { childNode->name.push_back(c); ++input; @@ -281,7 +281,7 @@ bool XmlNode::read(Input& input) } else { - while((c=input[0])>=0 && c!='>' && c!='/' && c!='"' && c!='\'' && c!='=' && c!=' ') + while((c=input[0])>=0 && c!='>' && c!='/' && c!='"' && c!='\'' && c!='=' && c!=' ' && c!='\n' && c!='\r') { option.push_back(c); ++input; @@ -328,7 +328,7 @@ bool XmlNode::read(Input& input) else { ++input; - while((c=input[0])>=0 && c!=' ' && c!='"' && c!='\'' && c!='>') + while((c=input[0])>=0 && c!=' ' && c!='\n' && c!='\r' && c!='"' && c!='\'' && c!='>') { value.push_back(c); ++input;