Changeset 9459

Timestamp:

01/07/09 12:24:47 (4 years ago)

Author:

robert

Message:

Fixed warnings

Location:

OpenSceneGraph/trunk

Files:

• examples/osganimationmakepath/osganimationmakepath.cpp (modified) (1 diff)
• examples/osganimationnode/osganimationnode.cpp (modified) (1 diff)
• examples/osganimationskinning/osganimationskinning.cpp (modified) (1 diff)
• examples/osganimationsolid/osganimationsolid.cpp (modified) (1 diff)
• examples/osganimationtimeline/osganimationtimeline.cpp (modified) (1 diff)
• examples/osganimationviewer/AnimtkViewerGUI.cpp (modified) (2 diffs)
• examples/osganimationviewer/AnimtkViewerKeyHandler.cpp (modified) (1 diff)
• examples/osgdrawinstanced/osgdrawinstanced.cpp (modified) (2 diffs)
• examples/osggeometryshaders/osggeometryshaders.cpp (modified) (1 diff)
• examples/osghud/osghud.cpp (modified) (1 diff)
• examples/osgimagesequence/osgimagesequence.cpp (modified) (1 diff)
• examples/osgmemorytest/osgmemorytest.cpp (modified) (2 diffs)
• examples/osgterrain/osgterrain.cpp (modified) (1 diff)
• examples/osgunittests/UnitTestFramework.h (modified) (1 diff)
• src/OpenThreads/win32/Win32Thread.cpp (modified) (1 diff)
• src/osg/dxtctool.h (modified) (1 diff)
• src/osgDB/DynamicLibrary.cpp (modified) (1 diff)
• src/osgDB/FileUtils.cpp (modified) (1 diff)
• src/osgGA/CameraViewSwitchManipulator.cpp (modified) (1 diff)
• src/osgGA/TrackballManipulator.cpp (modified) (1 diff)
• src/osgGA/UFOManipulator.cpp (modified) (1 diff)
• src/osgManipulator/RotateCylinderDragger.cpp (modified) (1 diff)
• src/osgManipulator/RotateSphereDragger.cpp (modified) (1 diff)
• src/osgManipulator/Scale1DDragger.cpp (modified) (1 diff)
• src/osgManipulator/Scale2DDragger.cpp (modified) (1 diff)
• src/osgManipulator/Translate1DDragger.cpp (modified) (1 diff)
• src/osgManipulator/Translate2DDragger.cpp (modified) (1 diff)
• src/osgPlugins/OpenFlight/FltExportVisitor.h (modified) (2 diffs)
• src/osgPlugins/OpenFlight/LightSourcePaletteManager.h (modified) (1 diff)
• src/osgPlugins/OpenFlight/MaterialPaletteManager.h (modified) (1 diff)
• src/osgPlugins/OpenFlight/TexturePaletteManager.h (modified) (2 diffs)
• src/osgPlugins/geo/ReaderWriterGEO.cpp (modified) (2 diffs)
• src/osgPlugins/hdr/ReaderWriterHDR.cpp (modified) (1 diff)
• src/osgPlugins/lwo/iffparser.h (modified) (1 diff)
• src/osgPlugins/lwo/lwo2parser.h (modified) (1 diff)
• src/osgPlugins/mdl/MDLReader.cpp (modified) (1 diff)
• src/osgPlugins/obj/OBJWriterNodeVisitor.h (modified) (1 diff)
• src/osgPlugins/txp/TXPParser.cpp (modified) (1 diff)
• src/osgPlugins/txp/TileMapper.cpp (modified) (1 diff)
• src/osgUtil/TriStrip_tri_stripper.h (modified) (1 diff)
• src/osgViewer/PixelBufferWin32.cpp (modified) (1 diff)
• src/osgViewer/View.cpp (modified) (1 diff)
• src/osgViewer/Viewer.cpp (modified) (1 diff)

OpenSceneGraph/trunk/examples/osganimationmakepath/osganimationmakepath.cpp

@@ -312 +312 @@
 int main(int argc, char** argv) 
 {
-    osgViewer::Viewer viewer;
+    osg::ArgumentParser arguments(&argc, argv);
+    osgViewer::Viewer viewer(arguments);
     
     osgGA::TrackballManipulator* tbm = new osgGA::TrackballManipulator();

OpenSceneGraph/trunk/examples/osganimationnode/osganimationnode.cpp

@@ -250 +250 @@
 int main (int argc, char* argv[])
 {
-    osgViewer::Viewer viewer;
+    osg::ArgumentParser arguments(&argc, argv);
+    osgViewer::Viewer viewer(arguments);
+
     osgGA::TrackballManipulator* manipulator = new osgGA::TrackballManipulator();
     viewer.setCameraManipulator(manipulator);

OpenSceneGraph/trunk/examples/osganimationskinning/osganimationskinning.cpp

@@ -157 +157 @@
 int main (int argc, char* argv[])
 {
-    osgViewer::Viewer viewer;
+    osg::ArgumentParser arguments(&argc, argv);
+    osgViewer::Viewer viewer(arguments);
+
     viewer.setCameraManipulator(new osgGA::TrackballManipulator());
 

OpenSceneGraph/trunk/examples/osganimationsolid/osganimationsolid.cpp

@@ -61 +61 @@
 int main (int argc, char* argv[])
 {
-    osgViewer::Viewer viewer;
+    osg::ArgumentParser arguments(&argc, argv);
+    osgViewer::Viewer viewer(arguments);
+
     viewer.setCameraManipulator(new osgGA::TrackballManipulator());
 

OpenSceneGraph/trunk/examples/osganimationtimeline/osganimationtimeline.cpp

@@ -110 +110 @@
     }
 
-    bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
+    bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter&)
     {
         if (ea.getEventType() == osgGA::GUIEventAdapter::KEYUP)

OpenSceneGraph/trunk/examples/osganimationviewer/AnimtkViewerGUI.cpp

@@ -45 +45 @@
     ButtonFunctor(): _speed(5) { _direction = -_speed; _previous = 0;}
 
-    bool enter(osgWidget::Event& ev)
+    bool enter(osgWidget::Event&)
     {
         _direction = _speed; 
@@ -51 +51 @@
     }
 
-    bool leave(osgWidget::Event& ev)
+    bool leave(osgWidget::Event&)
     {
         _direction = -_speed; 

OpenSceneGraph/trunk/examples/osganimationviewer/AnimtkViewerKeyHandler.cpp

@@ -43 +43 @@
 
 
-bool AnimtkKeyEventHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa,
+bool AnimtkKeyEventHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter&,
                                    osg::Object*, osg::NodeVisitor*)
 {

OpenSceneGraph/trunk/examples/osgdrawinstanced/osgdrawinstanced.cpp

@@ -120 +120 @@
 int main( int argc, char **argv )
 {
-    // Make a scene graph consisting of a single Geode, containing
+    osg::ArgumentParser arguments(&argc, argv);
+
+   // Make a scene graph consisting of a single Geode, containing
     // a single Geometry, and a single PrimitiveSet.
     osg::ref_ptr< osg::Geode > geode = new osg::Geode;
@@ -143 +145 @@
     // osgDB::writeNodeFile(*geode, "instanced.osg");
 
-    osgViewer::Viewer viewer;
+    osgViewer::Viewer viewer(arguments);
     viewer.setSceneData( geode.get() );
     return viewer.run();

OpenSceneGraph/trunk/examples/osggeometryshaders/osggeometryshaders.cpp

@@ -180 +180 @@
 ///////////////////////////////////////////////////////////////////////////
 
-int main( int argc, char *argv[] )
+int main( int , char * )
 {
     osg::Geode* root( new osg::Geode );

OpenSceneGraph/trunk/examples/osghud/osghud.cpp

@@ -237 +237 @@
         _snapImage(si) {}
 
-    bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
+    bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter&)
     {
         if (ea.getHandled()) return false;

OpenSceneGraph/trunk/examples/osgimagesequence/osgimagesequence.cpp

@@ -316 +316 @@
             return false;
     }
-    return false;
 }
 

OpenSceneGraph/trunk/examples/osgmemorytest/osgmemorytest.cpp

@@ -87 +87 @@
                 else  throw "Failed to create GraphicsWindow";
             }
-            return 0;
         }
         
@@ -171 +170 @@
                 throw "Invalid texture size of 0,0,0";
             }
-            return 0;            
         }
         

OpenSceneGraph/trunk/examples/osgterrain/osgterrain.cpp

@@ -128 +128 @@
             fr.attach(&fin);
 
-            bool readFilename;
+            bool readFilename = false;
 
             while(!fr.eof())

OpenSceneGraph/trunk/examples/osgunittests/UnitTestFramework.h

@@ -480 +480 @@
 private:
 
+    TestRunner& operator = (const TestRunner&) { return *this; }
+
     TestReport                   _db;            // Results
     TestContext&                 _ctx;            // The Global Testing Context

OpenSceneGraph/trunk/src/OpenThreads/win32/Win32Thread.cpp

@@ -438 +438 @@
     throw Win32ThreadCanceled();
 
-    return 0;
-
+//    return 0;
 }
 

OpenSceneGraph/trunk/src/osg/dxtctool.h

@@ -92 +92 @@
 
 protected:
+
+    dxtc_pixels& operator = (const dxtc_pixels&) { return *this; }
 
     // Limitation check functions

OpenSceneGraph/trunk/src/osgDB/DynamicLibrary.cpp

@@ -155 +155 @@
     return sym;
 #endif
-    return NULL;
 }

OpenSceneGraph/trunk/src/osgDB/FileUtils.cpp

@@ -696 +696 @@
         filenamechar* ptr;
 #ifdef OSG_USE_UTF8_FILENAME
-        if (ptr = _wgetenv(OSGDB_FILENAME_TEXT("PATH")))
-#else
-        if (ptr = getenv("PATH"))
+        if ((ptr = _wgetenv(OSGDB_FILENAME_TEXT("PATH"))))
+#else
+        if ((ptr = getenv("PATH")))
 #endif
         {

OpenSceneGraph/trunk/src/osgGA/CameraViewSwitchManipulator.cpp

@@ -68 +68 @@
             return false;
     }
-    return false;
 }
 

OpenSceneGraph/trunk/src/osgGA/TrackballManipulator.cpp

@@ -173 +173 @@
             return false;
     }
-    return false;
 }
 

OpenSceneGraph/trunk/src/osgGA/UFOManipulator.cpp

@@ -253 +253 @@
             return false;
     }
-
-    return false;
 }
 

OpenSceneGraph/trunk/src/osgManipulator/RotateCylinderDragger.cpp

@@ -147 +147 @@
             return false;
     }
-    return false;
 }
 

OpenSceneGraph/trunk/src/osgManipulator/RotateSphereDragger.cpp

@@ -149 +149 @@
             return false;
     }
-    return false;
 }
 

OpenSceneGraph/trunk/src/osgManipulator/Scale1DDragger.cpp

@@ -160 +160 @@
             return false;
     }
-    return false;
 }
 

OpenSceneGraph/trunk/src/osgManipulator/Scale2DDragger.cpp

@@ -183 +183 @@
             return false;
     }
-    return false;
 }
 

OpenSceneGraph/trunk/src/osgManipulator/Translate1DDragger.cpp

@@ -139 +139 @@
             return false;
     }
-    return false;
 }
 

OpenSceneGraph/trunk/src/osgManipulator/Translate2DDragger.cpp

@@ -138 +138 @@
             return false;
     }
-    return false;
 }
 

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/FltExportVisitor.h

@@ -239 +239 @@
     const std::string        id_;
     DataOutputStream* dos_;
+
+protected:
+
+    IdHelper& operator = (const IdHelper&) { return *this; }
+
 };
 
@@ -263 +268 @@
     flt::FltExportVisitor&  v_;
     bool _polygonOffsetOn;
+
+protected:
+
+    SubfaceHelper& operator = (const SubfaceHelper&) { return *this; }
 };
 

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/LightSourcePaletteManager.h

@@ -67 +67 @@
 
     ExportOptions& _fltOpt;
+
+protected:
+
+    LightSourcePaletteManager& operator = (const LightSourcePaletteManager&) { return *this; }
 };
 

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/MaterialPaletteManager.h

@@ -65 +65 @@
 
     ExportOptions& _fltOpt;
+
+protected:
+
+    MaterialPaletteManager& operator = (const MaterialPaletteManager&) { return *this; }
 };
 

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/TexturePaletteManager.h

@@ -47 +47 @@
 protected:
 
+    TexturePaletteManager& operator = (const TexturePaletteManager&) { return *this; }
+
     int _currIndex;
 
@@ -55 +57 @@
 
     const ExportOptions& _fltOpt;
+
 };
 

OpenSceneGraph/trunk/src/osgPlugins/geo/ReaderWriterGEO.cpp

@@ -1188 +1188 @@
         }
         Group *makeTextGeode(const georecord *gr)
-        { // in geo text is defined with a matrix included in the geo.geode (gr is this geo.geode)
+        {
+             // in geo text is defined with a matrix included in the geo.geode (gr is this geo.geode)
             // - we need to create this tree to render text
+#if 1            
             return NULL; // temporary disable april 2003
+#else
             Group *nug=new Group;
             const geoField *gfd=gr->getField(GEO_DB_RENDERGROUP_MAT);
@@ -1203 +1206 @@
             }
             return nug;
-        }
+#endif
+        }
+        
         Group *makeLightPointGeodes(const georecord *gr) {
             const geoField *gfd=gr->getField(GEO_DB_RENDERGROUP_MAT);

OpenSceneGraph/trunk/src/osgPlugins/hdr/ReaderWriterHDR.cpp

@@ -261 +261 @@
         if(!success)
         {
+            source = 0;    // delete the temporary image
             return WriteResult::ERROR_IN_WRITING_FILE;    // early out
-            source = 0;    // delete the temporary image
         }
 

OpenSceneGraph/trunk/src/osgPlugins/lwo/iffparser.h

@@ -52 +52 @@
 
         private:                
+                GenericParser& operator = (const GenericParser&) { return *this; }
+
+
                 Chunk_list chunks_;
                 std::ostream &os_;

OpenSceneGraph/trunk/src/osgPlugins/lwo/lwo2parser.h

@@ -35 +35 @@
                 virtual iff::Chunk *parse_chunk_data(const std::string &tag, const std::string &context, Iter it, Iter end);
                 iff::Chunk *parse_subchunk(Iter &it, const std::string &context);
+                
+                Parser& operator = (const Parser&) { return *this; }
         };
 

OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp

@@ -43 +43 @@
                                 size_t & index)
 {
-    size_t        start, end;
+    size_t start;
+    size_t end = std::string::npos;
     std::string   token;
 

OpenSceneGraph/trunk/src/osgPlugins/obj/OBJWriterNodeVisitor.h

@@ -137 +137 @@
     private:
         
+        OBJWriterNodeVisitor& operator = (const OBJWriterNodeVisitor&) { return *this; }
+
         void processGeometry(osg::Geometry* geo, osg::Matrix& m);
         void processArray(const std::string& key, osg::Array* array, const osg::Matrix& m = osg::Matrix::identity(), bool isNormal = false);

OpenSceneGraph/trunk/src/osgPlugins/txp/TXPParser.cpp

@@ -956 +956 @@
     _parse->getCurrTop()->addChild(osgGroup.get());
     return (void*)1;
-
-#if 0
-    osg::Group* osgGroup = new osg::Group;
-    _parse->setCurrentNode(osgGroup);
-    _parse->getCurrTop()->addChild(osgGroup);
-    _parse->addLayer(osgGroup);
-    return (void*)1;
-
-#else
-    if (_parse->underLayerSubgraph()) return (void*)1;
-
-    osg::ref_ptr<GeodeGroup> layer = new GeodeGroup;
-
-    _parse->setLayerGeode(layer->getGeode());
-    _parse->setUnderLayerSubgraph(true);
-    _parse->setCurrentNode(layer.get());
-    _parse->getCurrTop()->addChild(layer.get());
-
-    return (void *)1;
-#endif
 }
 

OpenSceneGraph/trunk/src/osgPlugins/txp/TileMapper.cpp

@@ -309 +309 @@
         }
     }
-    // we shouldn't get here...
-    
-    return true;
 }
 

OpenSceneGraph/trunk/src/osgUtil/TriStrip_tri_stripper.h

@@ -200 +200 @@
     friend struct _cmp_tri_interface_lt;
 
-
-
-
+    tri_stripper& operator = (const tri_stripper&) { return *this; }
 
     typedef common_structures::graph_array<triangle, char> triangles_graph;

OpenSceneGraph/trunk/src/osgViewer/PixelBufferWin32.cpp

@@ -666 +666 @@
     if (_traits->sharedContext)
     {
-        HGLRC hglrc;
+        HGLRC hglrc = 0;
 
         GraphicsWindowWin32* graphicsWindowWin32 = dynamic_cast<GraphicsWindowWin32*>(_traits->sharedContext);

OpenSceneGraph/trunk/src/osgViewer/View.cpp

@@ -1902 +1902 @@
         return false;
     }
-
-    return false;
 }
 

OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

@@ -289 +289 @@
         return false;
     }
-    
-    return false;
 }