From 288e1853b93ca105186f225a6e02b9e07c2230fe Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 17 Dec 2008 17:11:13 +0000
Subject: [PATCH] Fixed warnings

---
 src/osgViewer/CompositeViewer.cpp      |  2 --
 src/osgViewer/Renderer.cpp             |  2 +-
 src/osgViewer/ScreenCaptureHandler.cpp |  6 ++++--
 src/osgViewer/StatsHandler.cpp         | 14 +++++---------
 src/osgViewer/View.cpp                 |  8 ++------
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/osgViewer/CompositeViewer.cpp b/src/osgViewer/CompositeViewer.cpp
index aba92a7e6..15a2a8b15 100644
--- a/src/osgViewer/CompositeViewer.cpp
+++ b/src/osgViewer/CompositeViewer.cpp
@@ -991,8 +991,6 @@ void CompositeViewer::updateTraversal()
     {
         View* view = vitr->get();
 
-        Scene* scene = view->getScene();
-
         {
             // call any camera update callbacks, but only traverse that callback, don't traverse its subgraph
             // leave that to the scene update traversal.
diff --git a/src/osgViewer/Renderer.cpp b/src/osgViewer/Renderer.cpp
index 6b220ae34..3988f0576 100644
--- a/src/osgViewer/Renderer.cpp
+++ b/src/osgViewer/Renderer.cpp
@@ -345,7 +345,7 @@ void Renderer::draw()
 {
     DEBUG_MESSAGE<<"draw() "<<this<<std::endl;
 
-    osg::Timer_t startDrawTick = osg::Timer::instance()->tick();
+    // osg::Timer_t startDrawTick = osg::Timer::instance()->tick();
 
     osgUtil::SceneView* sceneView = _drawQueue.takeFront();
 
diff --git a/src/osgViewer/ScreenCaptureHandler.cpp b/src/osgViewer/ScreenCaptureHandler.cpp
index c71f431d7..36c7e0282 100644
--- a/src/osgViewer/ScreenCaptureHandler.cpp
+++ b/src/osgViewer/ScreenCaptureHandler.cpp
@@ -138,9 +138,11 @@ WindowCaptureCallback::ContextData::ContextData(osg::GraphicsContext* gc, Mode m
       _reportTimingFrequency(100),
       _numTimeValuesRecorded(0),
       _timeForReadPixels(0.0),
-      _timeForFullCopy(0.0),
       _timeForMemCpy(0.0),
-      _captureOperation(0)
+      _timeForCaptureOperation(0.0),
+      _timeForFullCopy(0.0),
+      _timeForFullCopyAndOperation(0.0),
+      _previousFrameTick(0)
 {
     _previousFrameTick = osg::Timer::instance()->tick();
     
diff --git a/src/osgViewer/StatsHandler.cpp b/src/osgViewer/StatsHandler.cpp
index 3b24f0179..32069d12f 100644
--- a/src/osgViewer/StatsHandler.cpp
+++ b/src/osgViewer/StatsHandler.cpp
@@ -238,7 +238,6 @@ void StatsHandler::reset()
 void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
 {
     osgViewer::GraphicsWindow* window = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext());
-    osg::GraphicsContext* context;
     
     if (!window)
     {    
@@ -248,14 +247,11 @@ void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
         if (windows.empty()) return;
 
         window = windows.front();
-
-                
-        context = window;
     }
 
-    _camera->setGraphicsContext(context);
+    _camera->setGraphicsContext(window);
 
-    _camera->setViewport(0, 0, context->getTraits()->width, context->getTraits()->height);
+    _camera->setViewport(0, 0, window->getTraits()->width, window->getTraits()->height);
     _camera->setRenderOrder(osg::Camera::POST_RENDER, 10);
 
     _camera->setProjectionMatrix(osg::Matrix::ortho2D(0,1280,0,1024));
@@ -828,9 +824,9 @@ struct PagerCallback : public virtual osg::NodeCallback
         _minValue(minValue),
         _maxValue(maxValue),
         _averageValue(averageValue),
-        _multiplier(multiplier),
         _filerequestlist(filerequestlist),
-        _compilelist(compilelist)
+        _compilelist(compilelist),
+        _multiplier(multiplier)
     {
     }
 
@@ -888,7 +884,7 @@ struct PagerCallback : public virtual osg::NodeCallback
     osg::ref_ptr<osgText::Text> _averageValue;
     osg::ref_ptr<osgText::Text> _filerequestlist;
     osg::ref_ptr<osgText::Text> _compilelist;
-    double _multiplier;
+    double              _multiplier;
     char                _tmpText[128];
     osg::Timer_t        _tickLastUpdated;
 };
diff --git a/src/osgViewer/View.cpp b/src/osgViewer/View.cpp
index 82a15af5f..b4d440ab1 100644
--- a/src/osgViewer/View.cpp
+++ b/src/osgViewer/View.cpp
@@ -210,7 +210,7 @@ void View::take(osg::View& rhs)
         
         rhs_osgViewer->_coordinateSystemNodePath.clear();
         
-        rhs_osgViewer->_displaySettings;
+        rhs_osgViewer->_displaySettings = 0;
     }
 #endif
     computeActiveCoordinateSystemNodePath();
@@ -1114,8 +1114,6 @@ static osg::Geometry* createParoramicSphericalDisplayDistortionMesh(const osg::V
     osg::Vec3d center(0.0,0.0,0.0);
     osg::Vec3d eye(0.0,0.0,0.0);
     
-    bool centerProjection = false;
-
     double distance = sqrt(sphere_radius*sphere_radius - collar_radius*collar_radius);
     bool flip = false;
     bool texcoord_flip = false;
@@ -1154,9 +1152,7 @@ static osg::Geometry* createParoramicSphericalDisplayDistortionMesh(const osg::V
 
     osg::Vec3 screenCenter = origin + widthVector*0.5f + heightVector*0.5f;
     float screenRadius = heightVector.length() * 0.5f;
-
-    double rotation = 0.0;
-
+    
     geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
 
     for(int i=0;i<noSteps;++i)