From 79c6ac38dfe53f70ccba0fb45cc7dd21c8aef771 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 17 Jun 2016 07:52:41 +0100 Subject: [PATCH] Fixed logically dead code detected by Coverity --- src/osgViewer/CompositeViewer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgViewer/CompositeViewer.cpp b/src/osgViewer/CompositeViewer.cpp index 0ddc3f3e4..8104d481e 100644 --- a/src/osgViewer/CompositeViewer.cpp +++ b/src/osgViewer/CompositeViewer.cpp @@ -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));