diff --git a/src/osgFX/Outline.cpp b/src/osgFX/Outline.cpp index a9dae9dbb..729e45d8a 100644 --- a/src/osgFX/Outline.cpp +++ b/src/osgFX/Outline.cpp @@ -91,7 +91,7 @@ namespace osgFX // stencil op osg::Stencil* stencil = new osg::Stencil; - stencil->setFunction(osg::Stencil::ALWAYS, 1, ~0); + stencil->setFunction(osg::Stencil::ALWAYS, 1, ~0u); stencil->setOperation(osg::Stencil::KEEP, osg::Stencil::KEEP, osg::Stencil::REPLACE); @@ -112,7 +112,7 @@ namespace osgFX // stencil op osg::Stencil* stencil = new osg::Stencil; - stencil->setFunction(osg::Stencil::NOTEQUAL, 1, ~0); + stencil->setFunction(osg::Stencil::NOTEQUAL, 1, ~0u); stencil->setOperation(osg::Stencil::KEEP, osg::Stencil::KEEP, osg::Stencil::REPLACE); diff --git a/src/osgGA/StateSetManipulator.cpp b/src/osgGA/StateSetManipulator.cpp index 9d98bfff5..4dcd1b2d4 100644 --- a/src/osgGA/StateSetManipulator.cpp +++ b/src/osgGA/StateSetManipulator.cpp @@ -103,7 +103,7 @@ bool StateSetManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& aa) (_stateset->getTextureMode(0,GL_TEXTURE_CUBE_MAP)&mode); #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) - _texture |= (_stateset->getTextureMode(0,GL_TEXTURE_1D)&mode); + _texture |= ((_stateset->getTextureMode(0,GL_TEXTURE_1D)&mode)!=0); #endif }