Changeset 9388

Timestamp:

12/18/08 12:06:57 (4 years ago)

Author:

robert

Message:

Fixed warnings

Location:

OpenSceneGraph/trunk

Files:

• include/osg/Image (modified) (1 diff)
• include/osgAnimation/EaseMotion (modified) (1 diff)
• src/osgPlugins/ive/DataOutputStream.cpp (modified) (1 diff)
• src/osgPlugins/osgWidget/Box.cpp (modified) (2 diffs)
• src/osgPlugins/osgWidget/EmbeddedWindow.cpp (modified) (2 diffs)
• src/osgPlugins/osgWidget/Frame.cpp (modified) (2 diffs)
• src/osgPlugins/osgWidget/Input.cpp (modified) (2 diffs)
• src/osgPlugins/osgWidget/Label.cpp (modified) (2 diffs)
• src/osgPlugins/osgWidget/Table.cpp (modified) (2 diffs)
• src/osgPlugins/osgWidget/Widget.cpp (modified) (5 diffs)
• src/osgPlugins/osgWidget/WindowManager.cpp (modified) (2 diffs)
• src/osgTerrain/GeometryTechnique.cpp (modified) (3 diffs)
• src/osgTerrain/Locator.cpp (modified) (1 diff)
• src/osgTerrain/TerrainTile.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/include/osg/Image

@@ -319 +319 @@
         const PixelBufferObject* getPixelBufferObject() const { return _bufferObject.get(); }
        
-        virtual void update(NodeVisitor* nv) {}
-        
+        virtual void update(NodeVisitor* /*nv*/) {}        
 
         /** method for sending pointer events to images that are acting as front ends to interactive surfaces such as a vnc or browser window.  Return true if handled. */
-        virtual bool sendPointerEvent(int x, int y, int buttonMask) { return false; }
+        virtual bool sendPointerEvent(int /*x*/, int /*y*/, int /*buttonMask*/) { return false; }
 
         /** method for sending key events to images that are acting as front ends to interactive surfaces such as a vnc or browser window.  Return true if handled.*/
-        virtual bool sendKeyEvent(int key, bool keyDown) { return false; }
+        virtual bool sendKeyEvent(int /*key*/, bool /*keyDown*/) { return false; }
 
         /** method for passing frame information to the custom Image classes, to be called only when objects associated with imagery are not culled.*/
-        virtual void setFrameLastRendered(const osg::FrameStamp* frameStamp) {}
+        virtual void setFrameLastRendered(const osg::FrameStamp* /*frameStamp*/) {}
 
     protected :

OpenSceneGraph/trunk/include/osgAnimation/EaseMotion

@@ -170 +170 @@
         {
             CLAMP,
-            LOOP,
+            LOOP
         };
         Motion(float startValue = 0, float duration = 1, float changeValue = 1, TimeBehaviour tb = CLAMP) : _time(0), _startValue(startValue), _changeValue(changeValue), _duration(duration), _behaviour(tb) {}

OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.cpp

@@ -647 +647 @@
     {
     
-        float byteError = 0.0f;
+        //float byteError = 0.0f;
         float byteMultiplier = 255.0f/(maxValue-minValue);
         float byteInvMultiplier = 1.0f/byteMultiplier;
 
-        float shortError = 0.0f;
+        //float shortError = 0.0f;
         float shortMultiplier = 65535.0f/(maxValue-minValue);
         float shortInvMultiplier = 1.0f/shortMultiplier;

OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Box.cpp

@@ -8 +8 @@
 #include <osgWidget/Box>
 
-bool osgWidget_Box_readData(osg::Object& obj, osgDB::Input& fr) {
+bool osgWidget_Box_readData(osg::Object& /*obj*/, osgDB::Input& fr) 
+{
         /*
         osgWidget::Box& box = static_cast<osgWidgegt::Box&>(obj);
@@ -46 +47 @@
 }
 
-bool osgWidget_Box_writeData(const osg::Object& obj, osgDB::Output& fw) {
-        const osgWidget::Box& model = static_cast<const osgWidget::Box&>(obj);
+bool osgWidget_Box_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
+{
+        // const osgWidget::Box& model = static_cast<const osgWidget::Box&>(obj);
         
         fw.indent() << fw.wrapString("Box stuff...") << std::endl;

OpenSceneGraph/trunk/src/osgPlugins/osgWidget/EmbeddedWindow.cpp

@@ -8 +8 @@
 #include <osgWidget/Window>
 
-bool osgWidget_EmbeddedWindow_readData(osg::Object& obj, osgDB::Input& fr) {
+bool osgWidget_EmbeddedWindow_readData(osg::Object& /*obj*/, osgDB::Input& fr)
+{
         osgWidget::warn() << "EmbeddedWindow read" << std::endl;
         
@@ -14 +15 @@
 }
 
-bool osgWidget_EmbeddedWindow_writeData(const osg::Object& obj, osgDB::Output& fw) {
-        const osgWidget::Window::EmbeddedWindow& model = 
-                static_cast<const osgWidget::Window::EmbeddedWindow&>(obj)
-        ;
+bool osgWidget_EmbeddedWindow_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
+{
+        // const osgWidget::Window::EmbeddedWindow& model = static_cast<const osgWidget::Window::EmbeddedWindow&>(obj);
         
         fw.indent() << fw.wrapString("EmbeddedWindow stuff...") << std::endl;

OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Frame.cpp

@@ -8 +8 @@
 #include <osgWidget/Frame>
 
-bool osgWidget_Frame_readData(osg::Object& obj, osgDB::Input& fr) {
+bool osgWidget_Frame_readData(osg::Object& /*obj*/, osgDB::Input& fr)
+{
         osgWidget::warn() << "Frame read" << std::endl;
         
@@ -14 +15 @@
 }
 
-bool osgWidget_Frame_writeData(const osg::Object& obj, osgDB::Output& fw) {
-        const osgWidget::Frame& model = static_cast<const osgWidget::Frame&>(obj);
+bool osgWidget_Frame_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
+{
+        // const osgWidget::Frame& model = static_cast<const osgWidget::Frame&>(obj);
         
         fw.indent() << fw.wrapString("Frame stuff...") << std::endl;

OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Input.cpp

@@ -8 +8 @@
 #include <osgWidget/Input>
 
-bool osgWidget_Input_readData(osg::Object& obj, osgDB::Input& fr) {
+bool osgWidget_Input_readData(osg::Object& /*obj*/, osgDB::Input& fr) 
+{
         osgWidget::warn() << "Input read" << std::endl;
         
@@ -14 +15 @@
 }
 
-bool osgWidget_Input_writeData(const osg::Object& obj, osgDB::Output& fw) {
-        const osgWidget::Input& model = static_cast<const osgWidget::Input&>(obj);
+bool osgWidget_Input_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
+{
+        // const osgWidget::Input& model = static_cast<const osgWidget::Input&>(obj);
         
         fw.indent() << fw.wrapString("Input stuff...") << std::endl;

OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Label.cpp

@@ -8 +8 @@
 #include <osgWidget/Label>
 
-bool osgWidget_Label_readData(osg::Object& obj, osgDB::Input& fr) {
+bool osgWidget_Label_readData(osg::Object& /*obj*/, osgDB::Input& fr) 
+{
         osgWidget::warn() << "Label read" << std::endl;
         
@@ -14 +15 @@
 }
 
-bool osgWidget_Label_writeData(const osg::Object& obj, osgDB::Output& fw) {
-        const osgWidget::Label& model = static_cast<const osgWidget::Label&>(obj);
+bool osgWidget_Label_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
+{
+        // const osgWidget::Label& model = static_cast<const osgWidget::Label&>(obj);
         
         fw.indent() << fw.wrapString("Label stuff...") << std::endl;

OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Table.cpp

@@ -8 +8 @@
 #include <osgWidget/Table>
 
-bool osgWidget_Table_readData(osg::Object& obj, osgDB::Input& fr) {
+bool osgWidget_Table_readData(osg::Object& /*obj*/, osgDB::Input& fr) {
         osgWidget::warn() << "Table read" << std::endl;
         
@@ -14 +14 @@
 }
 
-bool osgWidget_Table_writeData(const osg::Object& obj, osgDB::Output& fw) {
-        const osgWidget::Table& model = static_cast<const osgWidget::Table&>(obj);
+bool osgWidget_Table_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
+{
+        // const osgWidget::Table& model = static_cast<const osgWidget::Table&>(obj);
         
         fw.indent() << fw.wrapString("Table stuff...") << std::endl;

OpenSceneGraph/trunk/src/osgPlugins/osgWidget/Widget.cpp

@@ -15 +15 @@
 }
 
-bool osgWidget_Widget_writeData(const osg::Object& obj, osgDB::Output& fw) {
-        const osgWidget::Widget& model = static_cast<const osgWidget::Widget&>(obj);
+bool osgWidget_Widget_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
+{
+
+        // const osgWidget::Widget& model = static_cast<const osgWidget::Widget&>(obj);
         
         fw.indent() << fw.wrapString("Widget stuff...") << std::endl;
@@ -23 +25 @@
 }
 
-bool osgWidget_NotifyWidget_readData(osg::Object& obj, osgDB::Input& fr) {
+bool osgWidget_NotifyWidget_readData(osg::Object& /*obj*/, osgDB::Input& fr)
+{
         osgWidget::warn() << "NotifyWidget read" << std::endl;
         
@@ -29 +32 @@
 }
 
-bool osgWidget_NotifyWidget_writeData(const osg::Object& obj, osgDB::Output& fw) {
-        const osgWidget::NotifyWidget& model = static_cast<const osgWidget::NotifyWidget&>(obj);
+bool osgWidget_NotifyWidget_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
+{
+        // const osgWidget::NotifyWidget& model = static_cast<const osgWidget::NotifyWidget&>(obj);
         
         fw.indent() << fw.wrapString("NotifyWidget stuff...") << std::endl;
@@ -37 +41 @@
 }
 
-bool osgWidget_NullWidget_readData(osg::Object& obj, osgDB::Input& fr) {
+bool osgWidget_NullWidget_readData(osg::Object& /*obj*/, osgDB::Input& fr)
+{
         osgWidget::warn() << "NullWidget read" << std::endl;
         
@@ -43 +48 @@
 }
 
-bool osgWidget_NullWidget_writeData(const osg::Object& obj, osgDB::Output& fw) {
-        const osgWidget::NullWidget& model = static_cast<const osgWidget::NullWidget&>(obj);
+bool osgWidget_NullWidget_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
+{
+        // const osgWidget::NullWidget& model = static_cast<const osgWidget::NullWidget&>(obj);
         
         fw.indent() << fw.wrapString("NullWidget stuff...") << std::endl;

OpenSceneGraph/trunk/src/osgPlugins/osgWidget/WindowManager.cpp

@@ -8 +8 @@
 #include <osgWidget/WindowManager>
 
-bool osgWidget_WindowManager_readData(osg::Object& obj, osgDB::Input& fr) {
+bool osgWidget_WindowManager_readData(osg::Object& /*obj*/, osgDB::Input& fr)
+{
         osgWidget::warn() << "WindowManager read" << std::endl;
         
@@ -14 +15 @@
 }
 
-bool osgWidget_WindowManager_writeData(const osg::Object& obj, osgDB::Output& fw) {
-        const osgWidget::WindowManager& model = static_cast<const osgWidget::WindowManager&>(obj);
+bool osgWidget_WindowManager_writeData(const osg::Object& /*obj*/, osgDB::Output& fw)
+{
+        // const osgWidget::WindowManager& model = static_cast<const osgWidget::WindowManager&>(obj);
         
         fw.indent() << fw.wrapString("WindowManager stuff...") << std::endl;

OpenSceneGraph/trunk/src/osgTerrain/GeometryTechnique.cpp

@@ -284 +284 @@
     
 
-    float minHeight = 0.0;
+    //float minHeight = 0.0;
     float scaleHeight = _terrainTile->getTerrain() ? _terrainTile->getTerrain()->getVerticalScale() : 1.0f;
 
@@ -312 +312 @@
                     {
                         if (switchLayer->getActiveLayer()>=0 &&
-                            switchLayer->getActiveLayer()<switchLayer->getNumLayers() &&
+                            static_cast<unsigned int>(switchLayer->getActiveLayer())<switchLayer->getNumLayers() &&
                             switchLayer->getLayer(switchLayer->getActiveLayer()))
                         {
@@ -698 +698 @@
         if (switchLayer)
         {
-            if (switchLayer->getActiveLayer()<0 || switchLayer->getActiveLayer()>=switchLayer->getNumLayers())
+            if (switchLayer->getActiveLayer()<0 || 
+                static_cast<unsigned int>(switchLayer->getActiveLayer())>=switchLayer->getNumLayers())
             {
                 continue;

OpenSceneGraph/trunk/src/osgTerrain/Locator.cpp

@@ -34 +34 @@
     osg::Object(locator,copyop),
     _coordinateSystemType(locator._coordinateSystemType),
-    _ellipsoidModel(locator._ellipsoidModel),
     _format(locator._format),
     _cs(locator._cs),
+    _ellipsoidModel(locator._ellipsoidModel),
     _transform(locator._transform),
     _definedInFile(locator._definedInFile),

OpenSceneGraph/trunk/src/osgTerrain/TerrainTile.cpp

@@ -41 +41 @@
 TerrainTile::TerrainTile():
     _terrain(0),
+    _dirty(false),
     _hasBeenTraversal(false),
     _requiresNormals(true),
-    _treatBoundariesToValidDataAsDefaultValue(false),
-    _dirty(false)
+    _treatBoundariesToValidDataAsDefaultValue(false)
 {
     setThreadSafeRefUnref(true);
@@ -52 +52 @@
     Group(terrain,copyop),
     _terrain(0),
+    _dirty(false),
     _hasBeenTraversal(false),
     _elevationLayer(terrain._elevationLayer),
     _colorLayers(terrain._colorLayers),
     _requiresNormals(terrain._requiresNormals),
-    _treatBoundariesToValidDataAsDefaultValue(terrain._treatBoundariesToValidDataAsDefaultValue),
-    _dirty(false)
+    _treatBoundariesToValidDataAsDefaultValue(terrain._treatBoundariesToValidDataAsDefaultValue)
 {
     if (terrain.getTerrainTechnique())