From cb627520a7be5bc29e632c55c217aae8e0722873 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 24 Jun 2011 08:16:59 +0000
Subject: [PATCH] From Wang Rui, Merged from svn/trunk changeset 12633.

"I've modified the code to handle -1.#IND and other kinds of infinite
values. Please see the attachments for details"
---
 src/osgPlugins/osg/AsciiStreamOperator.h | 16 ++++++++--------
 src/osgPlugins/osg/XmlStreamOperator.h   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/osgPlugins/osg/AsciiStreamOperator.h b/src/osgPlugins/osg/AsciiStreamOperator.h
index e9013f4e6..98113d22d 100644
--- a/src/osgPlugins/osg/AsciiStreamOperator.h
+++ b/src/osgPlugins/osg/AsciiStreamOperator.h
@@ -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; }
diff --git a/src/osgPlugins/osg/XmlStreamOperator.h b/src/osgPlugins/osg/XmlStreamOperator.h
index 8ecaacd56..c85d0a767 100644
--- a/src/osgPlugins/osg/XmlStreamOperator.h
+++ b/src/osgPlugins/osg/XmlStreamOperator.h
@@ -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 )
     {