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

Form Brede Johansen, move from istrstream to istringstream.

Browse Source 
From Robert Osfield, remapped Paul Martz's changes to Pools.h and PaletteRecords.cpp w.r.t texturePatternIndex being a in16, and converted a char* string to a std::string.
This commit is contained in:
Robert Osfield
2006-06-29 09:34:41 +00:00
parent e0258f23b3
commit e12c6b7902
12 changed files with 149 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/OpenFlight/GeometryRecords.cpp
View File

@@ -509,14 +509,14 @@ protected:
int vertices = (in.getRecordSize()-4) / 4;
// Use the Vertex pool as a record stream.
RecordInputStream inVP(vp);
RecordInputStream inVP(vp->rdbuf());
for (int n=0; n<vertices; n++)
{
// Get position of vertex.
uint32 pos = in.readUInt32();
// Get vertex from vertex pool.
inVP().seekg((std::istream::pos_type)pos);
inVP.seekg((std::istream::pos_type)pos);
inVP.readRecord(document);
}
}
@@ -588,7 +588,7 @@ protected:
int vertices = (in.getRecordSize()-4) / 8;
// Use the Vertex pool as a record stream.
RecordInputStream inVP(vp);
RecordInputStream inVP(vp->rdbuf());
for (int n=0; n<vertices; n++)
{
// Get position of vertex.
@@ -599,12 +599,12 @@ protected:
// 0%
_mode = MORPH_0;
inVP().seekg((std::istream::pos_type)offset0);
inVP.seekg((std::istream::pos_type)offset0);
inVP.readRecord(document);
// 100%
_mode = MORPH_100;
inVP().seekg((std::istream::pos_type)offset100);
inVP.seekg((std::istream::pos_type)offset100);
inVP.readRecord(document);
}
}