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

Removed logically dead code detected by Coverity

Browse Source
This commit is contained in:
Robert Osfield
2016-06-17 07:46:39 +01:00
parent 78b99c7143
commit c85c006557
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgViewer/Viewer.cpp
View File

@@ -808,7 +808,7 @@ void Viewer::generatePointerData(osgGA::GUIEventAdapter& event)
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()) )
@@ -824,7 +824,7 @@ void Viewer::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));