From 5b1ca779e44d17e65a292eb3ff598f98d7f97635 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 10 Feb 2010 17:03:09 +0000
Subject: [PATCH] Added OutputStream::writeSize and InputStream::readSize
 methods to help out with ensure that 32bit and 64bit builds all use the same
 32bit type for sizes.

---
 include/osgDB/InputStream  |  7 +++++--
 include/osgDB/OutputStream |  8 ++++++--
 src/osgDB/InputStream.cpp  |  6 +++---
 src/osgDB/OutputStream.cpp | 10 +++++-----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/include/osgDB/InputStream b/include/osgDB/InputStream
index fab7843cb..915776b32 100644
--- a/include/osgDB/InputStream
+++ b/include/osgDB/InputStream
@@ -126,7 +126,10 @@ public:
     void advanceToCurrentEndBracket();
     void readWrappedString( std::string& str );
     void readCharArray( char* s, unsigned int size ) { _in->readCharArray(s, size); }
-    
+
+    // readSize() use unsigned int for all sizes.
+    unsigned int readSize() { unsigned int size; *this>>size; return size; }
+
     // Global reading functions
     osg::Array* readArray();
     osg::PrimitiveSet* readPrimitiveSet();
@@ -149,7 +152,7 @@ protected:
     void setWrapperSchema( const std::string& name, const std::string& properties );
     
     template<typename T>
-    void readArrayImplementation( T* a, int readSize, bool useByteSwap=false );
+    void readArrayImplementation( T* a, int read_size, bool useByteSwap=false );
     
     ArrayMap _arrayMap;
     IdentifierMap _identifierMap;
diff --git a/include/osgDB/OutputStream b/include/osgDB/OutputStream
index 66fb57653..85758b48b 100644
--- a/include/osgDB/OutputStream
+++ b/include/osgDB/OutputStream
@@ -134,7 +134,11 @@ public:
     // Convenient methods for writing
     void writeWrappedString( const std::string& str );
     void writeCharArray( const char* s, unsigned int size ) { _out->writeCharArray(s, size); }
-    
+
+    // method for converting all data structure sizes to unsigned int to ensure architecture portability.
+    template<typename T>
+    void writeSize(T size) { *this<<static_cast<unsigned int>(size); }
+
     // Global writing functions
     void writeArray( const osg::Array* a );
     void writePrimitiveSet( const osg::PrimitiveSet* p );
@@ -153,7 +157,7 @@ public:
     
 protected:
     template<typename T>
-    void writeArrayImplementation( const T*, int writeSize, unsigned int numInRow=1 );
+    void writeArrayImplementation( const T*, int write_size, unsigned int numInRow=1 );
     
     unsigned int findOrCreateArrayID( const osg::Array* array );
     unsigned int findOrCreateObjectID( const osg::Object* obj );
diff --git a/src/osgDB/InputStream.cpp b/src/osgDB/InputStream.cpp
index dd5732079..741887e3a 100644
--- a/src/osgDB/InputStream.cpp
+++ b/src/osgDB/InputStream.cpp
@@ -763,7 +763,7 @@ void InputStream::resetSchema()
 }
 
 template<typename T>
-void InputStream::readArrayImplementation( T* a, int readSize, bool useByteSwap )
+void InputStream::readArrayImplementation( T* a, int read_size, bool useByteSwap )
 {
     int size = 0;
     *this >> size >> BEGIN_BRACKET;
@@ -772,11 +772,11 @@ void InputStream::readArrayImplementation( T* a, int readSize, bool useByteSwap
         a->resize( size );
         if ( isBinary() )
         {
-            _in->getStream()->read( (char*)&((*a)[0]), readSize*size ); checkStream();
+            _in->getStream()->read( (char*)&((*a)[0]), read_size*size ); checkStream();
             if ( useByteSwap && _byteSwap )
             {
                 for ( int i=0; i<size; ++i )
-                    osg::swapBytes( (char*)&((*a)[i]), readSize );
+                    osg::swapBytes( (char*)&((*a)[i]), read_size );
             }
         }
         else
diff --git a/src/osgDB/OutputStream.cpp b/src/osgDB/OutputStream.cpp
index 68d9669e2..1d256850a 100644
--- a/src/osgDB/OutputStream.cpp
+++ b/src/osgDB/OutputStream.cpp
@@ -362,7 +362,7 @@ void OutputStream::writeImage( const osg::Image* img )
             
             // _mipmapData
             const osg::Image::MipmapDataType& levels = img->getMipmapLevels();
-            *this << levels.size();
+            writeSize(levels.size());
             for ( osg::Image::MipmapDataType::const_iterator itr=levels.begin();
                   itr!=levels.end(); ++itr )
             {
@@ -552,12 +552,12 @@ void OutputStream::writeSchema( std::ostream& fout )
 // PROTECTED METHODS
 
 template<typename T>
-void OutputStream::writeArrayImplementation( const T* a, int writeSize, unsigned int numInRow )
+void OutputStream::writeArrayImplementation( const T* a, int write_size, unsigned int numInRow )
 {
-    *this << writeSize << BEGIN_BRACKET;
+    *this << write_size << BEGIN_BRACKET;
     if ( numInRow>1 )
     {
-        for ( int i=0; i<writeSize; ++i )
+        for ( int i=0; i<write_size; ++i )
         {
             if ( !(i%numInRow) )
             {
@@ -571,7 +571,7 @@ void OutputStream::writeArrayImplementation( const T* a, int writeSize, unsigned
     else
     {
         *this << std::endl;
-        for ( int i=0; i<writeSize; ++i )
+        for ( int i=0; i<write_size; ++i )
             *this << (*a)[i] << std::endl;
     }
     *this << END_BRACKET << std::endl;