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

From Wang Rui, Merged from svn/trunk changeset 12633.

Browse Source 
"I've modified the code to handle -1.#IND and other kinds of infinite
values. Please see the attachments for details"
This commit is contained in:
Robert Osfield
2011-06-24 08:16:59 +00:00
parent c5867e4957
commit cb627520a7
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgPlugins/osg/AsciiStreamOperator.h
View File

@@ -166,28 +166,28 @@ public:
}
virtual void readShort( short& s )
{ *_in >> s; }
{ std::string str; *_in >> str; s = static_cast<short>(strtol(str.c_str(), NULL, 0)); }
virtual void readUShort( unsigned short& s )
{ *_in >> s; }
{ std::string str; *_in >> str; s = static_cast<unsigned short>(strtoul(str.c_str(), NULL, 0)); }
virtual void readInt( int& i )
{ *_in >> i; }
{ std::string str; *_in >> str; i = static_cast<int>(strtol(str.c_str(), NULL, 0)); }
virtual void readUInt( unsigned int& i )
{ *_in >> i; }
{ std::string str; *_in >> str; i = static_cast<unsigned int>(strtoul(str.c_str(), NULL, 0)); }
virtual void readLong( long& l )
{ *_in >> l; }
{ std::string str; *_in >> str; l = strtol(str.c_str(), NULL, 0); }
virtual void readULong( unsigned long& l )
{ *_in >> l; }
{ std::string str; *_in >> str; l = strtoul(str.c_str(), NULL, 0); }
virtual void readFloat( float& f )
{ *_in >> f; }
{ std::string str; *_in >> str; f = osg::asciiToFloat(str.c_str()); }
virtual void readDouble( double& d )
{ *_in >> d; }
{ std::string str; *_in >> str; d = osg::asciiToDouble(str.c_str()); }
virtual void readString( std::string& s )
{ *_in >> s; }

16
src/osgPlugins/osg/XmlStreamOperator.h
View File

@@ -349,28 +349,28 @@ public:
}
virtual void readShort( short& s )
{ if ( prepareStream() ) _sstream >> s; }
{ std::string str; if (prepareStream()) _sstream >> str; s = static_cast<short>(strtol(str.c_str(), NULL, 0)); }
virtual void readUShort( unsigned short& s )
{ if ( prepareStream() ) _sstream >> s; }
{ std::string str; if (prepareStream()) _sstream >> str; s = static_cast<unsigned short>(strtoul(str.c_str(), NULL, 0)); }
virtual void readInt( int& i )
{ if ( prepareStream() ) _sstream >> i; }
{ std::string str; if (prepareStream()) _sstream >> str; i = static_cast<int>(strtol(str.c_str(), NULL, 0)); }
virtual void readUInt( unsigned int& i )
{ if ( prepareStream() ) _sstream >> i; }
{ std::string str; if (prepareStream()) _sstream >> str; i = static_cast<unsigned int>(strtoul(str.c_str(), NULL, 0)); }
virtual void readLong( long& l )
{ if ( prepareStream() ) _sstream >> l; }
{ std::string str; if (prepareStream()) _sstream >> str; l = strtol(str.c_str(), NULL, 0); }
virtual void readULong( unsigned long& l )
{ if ( prepareStream() ) _sstream >> l; }
{ std::string str; if (prepareStream()) _sstream >> str; l = strtoul(str.c_str(), NULL, 0); }
virtual void readFloat( float& f )
{ if ( prepareStream() ) _sstream >> f; }
{ std::string str; if (prepareStream()) _sstream >> str; f = osg::asciiToFloat(str.c_str()); }
virtual void readDouble( double& d )
{ if ( prepareStream() ) _sstream >> d; }
{ std::string str; if (prepareStream()) _sstream >> str; d = osg::asciiToDouble(str.c_str()); }
virtual void readString( std::string& s )
{