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

Fixed return in readString.

Browse Source
This commit is contained in:
Robert Osfield
2007-02-08 14:59:20 +00:00
parent 19608966d0
commit 4f1a1c8b16
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgPlugins/ive/DataInputStream.cpp
View File

@@ -281,7 +281,8 @@ unsigned long DataInputStream::readULong(){
return l;
}
double DataInputStream::readDouble(){
double DataInputStream::readDouble()
{
double d;
_istream->read((char*)&d, DOUBLESIZE);
if (_istream->rdstate() & _istream->failbit)
@@ -292,11 +293,13 @@ double DataInputStream::readDouble(){
return d;
}
std::string DataInputStream::readString(){
std::string DataInputStream::readString()
{
std::string s;
int size = readInt();
if (size == 0)
return NULL;
return std::string();
s.resize(size);
_istream->read((char*)s.c_str(), size);
//if (_istream->rdstate() & _istream->failbit)
@@ -307,7 +310,8 @@ std::string DataInputStream::readString(){
return s;
}
void DataInputStream::readCharArray(char* data, int size){
void DataInputStream::readCharArray(char* data, int size)
{
_istream->read(data, size);
if (_istream->rdstate() & _istream->failbit)
throw Exception("DataInputStream::readCharArray(): Failed to read char value.");