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

Fixed warnings

Browse Source
This commit is contained in:
Robert Osfield
2008-12-18 12:26:14 +00:00
parent de17dad958
commit 215cd5f29b
5 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgPlugins/txp/trpage_range.cpp
View File

@@ -139,8 +139,8 @@ bool trpgRange::operator == (const trpgRange &in) const
if (strcmp(category,in.category))
return false;
} else {
if (category && !in.category ||
!category && in.category)
if ((category && !in.category) ||
(!category && in.category) )
return false;
}
@@ -148,8 +148,8 @@ bool trpgRange::operator == (const trpgRange &in) const
if (strcmp(subCategory,in.subCategory))
return false;
} else {
if (subCategory && !in.subCategory ||
!subCategory && in.subCategory)
if ((subCategory && !in.subCategory) ||
(subCategory && in.subCategory))
return false;
}
if(handle != in.handle)
@@ -192,8 +192,14 @@ bool trpgRange::Read(trpgReadBuffer &buf)
// Read the handle if we can..
try {
if(!buf.Get((int32 &)handle)) {
handle = -1;
int32 tempHandle;
if(buf.Get(tempHandle))
{
handle = tempHandle;
}
else
{
handle = -1;
}
}
catch (...) {