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

Added OutputStream::writeSize and InputStream::readSize methods to help out with ensure that 32bit and 64bit builds all

Browse Source 
use the same 32bit type for sizes.
This commit is contained in:
Robert Osfield
2010-02-10 17:03:09 +00:00
parent f3ee7fa6ba
commit 5b1ca779e4
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/osgDB/InputStream
View File

@@ -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;