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

Fixed logically dead code detected by Coverity

Browse Source
This commit is contained in:
Robert Osfield 2016-06-17 07:52:41 +01:00
parent c85c006557
commit 79c6ac38df
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgViewer/CompositeViewer.cpp
View File

@ -778,7 +778,7 @@ void CompositeViewer::generateSlavePointerData(osg::Camera* camera, osgGA::GUIEv
}
// slave Camera tahnks to sharing the same View
osg::View::Slave* slave = view ? view->findSlaveForCamera(camera) : 0;
osg::View::Slave* slave = view->findSlaveForCamera(camera);
if (slave)
{
if (camera->getReferenceFrame()==osg::Camera::RELATIVE_RF && slave->_useMastersSceneData)
@ -872,7 +872,7 @@ void CompositeViewer::generatePointerData(osgGA::GUIEventAdapter& event)
if (camera->getAllowEventFocus() &&
camera->getRenderTargetImplementation()==osg::Camera::FRAME_BUFFER)
{
osg::Viewport* viewport = camera ? camera->getViewport() : 0;
osg::Viewport* viewport = camera->getViewport();
if (viewport &&
x >= viewport->x() && y >= viewport->y() &&
x <= (viewport->x()+viewport->width()) && y <= (viewport->y()+viewport->height()) )
@ -888,7 +888,7 @@ void CompositeViewer::generatePointerData(osgGA::GUIEventAdapter& event)
if (camera)
{
osg::Viewport* viewport = camera ? camera->getViewport() : 0;
osg::Viewport* viewport = camera->getViewport();
event.addPointerData(new osgGA::PointerData(camera, (x-viewport->x())/viewport->width()*2.0f-1.0f, -1.0, 1.0,
(y-viewport->y())/viewport->height()*2.0f-1.0f, -1.0, 1.0));