Warning fixes for:
OpenSceneGraph/src/osgPlugins/Inventor/ConvertFromInventor.cpp: In member function ?virtual SbBool SoVRMLImageTextureOsg::readInstance(SoInput*, short unsigned int)?: OpenSceneGraph/src/osgPlugins/Inventor/ConvertFromInventor.cpp:1264:16: warning: variable ?retval? set but not used [-Wunused-but-set-variable] OpenSceneGraph/src/osgPlugins/ac/Geode.cpp: In member function ?void ac3d::Geode::ProcessGeometry(std::ostream&, unsigned int)?: OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:806:35: warning: variable ?fRep_s? set but not used [-Wunused-but-set-variable] OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:806:43: warning: variable ?fRep_t? set but not used [-Wunused-but-set-variable] OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:807:35: warning: variable ?fOffset_s? set but not used [-Wunused-but-set-variable] OpenSceneGraph/src/osgPlugins/ac/Geode.cpp:807:46: warning: variable ?fOffset_t? set but not used [-Wunused-but-set-variable] OpenSceneGraph/src/osgViewer/GraphicsWindowX11.cpp: In member function ?virtual void osgViewer::GraphicsWindowX11::checkEvents()?: OpenSceneGraph/src/osgViewer/GraphicsWindowX11.cpp:1181:10: warning: variable ?destroyWindowRequested? set but not used [-Wunused-but-set-variable]
This commit is contained in:
@@ -1261,10 +1261,9 @@ SbBool SoVRMLImageTextureOsg::readInstance(SoInput *in, unsigned short flags)
|
||||
// create options and read the file
|
||||
osgDB::ReaderWriter::Options *options = createOptions();
|
||||
|
||||
SbBool retval = TRUE;
|
||||
if (url.getNum() && url[0].getLength()) {
|
||||
if (url.getNum() && url[0].getLength())
|
||||
{
|
||||
osg::ref_ptr<osg::Image> image = loadImage(url[0].getString(), options);
|
||||
retval = image->valid();
|
||||
if (!image->valid())
|
||||
{
|
||||
OSG_WARN << "Could not read texture file: " << url[0].getString() << std::endl;
|
||||
@@ -1288,8 +1287,6 @@ SbBool SoVRMLImageTextureOsg::readInstance(SoInput *in, unsigned short flags)
|
||||
// We can safely ignore this as we are not going to render the scene graph.
|
||||
}
|
||||
}
|
||||
else
|
||||
retval = TRUE;
|
||||
}
|
||||
|
||||
url.enableNotify(oldNotify);
|
||||
|
||||
Reference in New Issue
Block a user