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

Fixed reading/writing of non C string osg::Text::String's.

Browse Source
This commit is contained in:
Robert Osfield
2006-09-19 13:54:04 +00:00
parent b296e10a0d
commit 45dc4572a9
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osgPlugins/ive/IveVersion.h
View File

@@ -26,8 +26,9 @@
#define VERSION_0015 15
#define VERSION_0016 16
#define VERSION_0017 17
#define VERSION_0018 18
#define VERSION VERSION_0017
#define VERSION VERSION_0018
/* The BYTE_SEX tag is used to check the endian
of the IVE file being read in. The IVE format

35
src/osgPlugins/ive/Text.cpp
View File

@@ -102,17 +102,17 @@ void Text::write(DataOutputStream* out){
else
{
// do it the hardway...output each character as an int
osg::ref_ptr<osg::UByteArray> strarr = new osg::UByteArray(textstring.size());
osg::ref_ptr<osg::UIntArray> strarr = new osg::UIntArray(textstring.size());
for(itr=textstring.begin();
itr!=textstring.end();
++itr)
{
strarr->push_back((char)(*itr));
strarr->push_back((*itr));
}
out->writeBool(false);
out->writeUByteArray(strarr.get());
out->writeUIntArray(strarr.get());
}
}
@@ -168,16 +168,29 @@ void Text::read(DataInputStream* in){
setText(in->readString());
else
{
std::string textstr;
osg::ref_ptr<osg::UByteArray> arr = in->readUByteArray();
for(unsigned int i = 0; i < arr->getNumElements(); i++)
if ( in->getVersion() >= VERSION_0018 )
{
textstr += (char) arr->at(i);
}
osgText::String textstr;
osg::ref_ptr<osg::UIntArray> arr = in->readUIntArray();
for(unsigned int i = 0; i < arr->getNumElements(); i++)
{
textstr.push_back( arr->at(i) );
}
setText(textstr);
setText(textstr);
}
else
{
// buggy original path, should have used a UIntArray originally, now fixed above.
std::string textstr;
osg::ref_ptr<osg::UByteArray> arr = in->readUByteArray();
for(unsigned int i = 0; i < arr->getNumElements(); i++)
{
textstr += (char) arr->at(i);
}
setText(textstr);
}
}
}