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 2004-08-02 14:52:24 +00:00
parent 79bc32ad7c
commit 2d901bf7ee
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgGL2/ProgramObject.cpp
View File

@ -232,7 +232,13 @@ void ProgramObject::dirtyShaderObjects()
void ProgramObject::releaseGLObjects(osg::State* state) const void ProgramObject::releaseGLObjects(osg::State* state) const
{ {
const_cast<ProgramObject*>(this)->dirtyShaderObjects();
if (!state) const_cast<ProgramObject*>(this)->dirtyShaderObjects();
else
{
unsigned int contextID = state->getContextID();
const_cast<ProgramObject*>(this)->_shaderObjectList[contextID]->dirtyShaderObject();
}
} }

2
src/osgPlugins/flt/flt2osg.cpp
View File

@ -1284,7 +1284,7 @@ osg::Group* ConvertFromFLT::visitObject(osg::Group& osgParent, ObjectRecord* rec
std::string desc("flt object flags: 0x"); std::string desc("flt object flags: 0x");
char cflags[33]; char cflags[33];
sprintf( cflags, "%X", pSObject->dwFlags ); sprintf( cflags, "%X", (unsigned int)pSObject->dwFlags );
desc = desc + cflags; desc = desc + cflags;
object->getDescriptions().push_back( desc ); object->getDescriptions().push_back( desc );

2
src/osgPlugins/txp/TXPParser.cpp
View File

@ -921,6 +921,8 @@ void* labelRead::Parse(trpgToken /*tok*/,trpgReadBuffer &buf)
_parse->getCurrTop()->addChild(group); _parse->getCurrTop()->addChild(group);
} }
break; break;
default:
break;
} }
const std::vector<trpg3dPoint> *supports = label.GetSupports(); const std::vector<trpg3dPoint> *supports = label.GetSupports();