Merge remote-tracking branch 'upstream/master'

src/OpenThreads/CMakeLists.txt

@@ -44,6 +44,14 @@ IF(MSVC)
 ENDIF()
 
 
+################################################################################
+## Quieten warnings that a due to optional code paths
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -Wextra flag as it barfs on ffmoeg headers
+   STRING(REGEX REPLACE "-Wextra" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
 # INSTALL_FILES(/include/OpenThreads/ FILES "${OPENTHREADS_CONFIG_HEADER}")
 
 ################################################################################

src/osg/CMakeLists.txt

@@ -420,6 +420,17 @@ SET(TARGET_SRC
 
     ${OPENSCENEGRAPH_VERSIONINFO_RC}
 )
+
+################################################################################
+## Quieten warnings that a due to optional code paths
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -Wextra flag as it barfs on ffmoeg headers
+   STRING(REGEX REPLACE "-Wextra" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
+
+
 SET(TARGET_LIBRARIES OpenThreads)
 
 SET(TARGET_EXTERNAL_LIBRARIES

src/osg/KdTree.cpp

@@ -795,6 +795,7 @@ KdTreeBuilder::KdTreeBuilder():
 }
 
 KdTreeBuilder::KdTreeBuilder(const KdTreeBuilder& rhs):
+    osg::Object(rhs),
     osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
     _buildOptions(rhs._buildOptions),
     _kdTreePrototype(rhs._kdTreePrototype)

src/osgAnimation/ActionCallback.cpp

@@ -15,7 +15,7 @@
 #include <osgAnimation/ActionCallback>
 #include <osgAnimation/Timeline>
 
-void osgAnimation::RunAction::operator()(Action* action, ActionVisitor* visitor)
+void osgAnimation::RunAction::operator()(Action* /*action*/, ActionVisitor* visitor)
 {
     Timeline* tm = visitor->getCurrentTimeline();
     tm->addActionNow(_action.get(), _priority);

src/osgAnimation/AnimationManagerBase.cpp

@@ -62,7 +62,10 @@ void AnimationManagerBase::operator()(osg::Node* node, osg::NodeVisitor* nv)
 }
 
 
-AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) : osg::NodeCallback(b,copyop) // TODO check this
+AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) :
+    osg::Object(b,copyop),
+    osg::Callback(b,copyop),
+    osg::NodeCallback(b,copyop) // TODO check this
 {
     const AnimationList& animationList = b.getAnimationList();
     for (AnimationList::const_iterator it = animationList.begin();

src/osgAnimation/Skeleton.cpp

@@ -26,6 +26,7 @@ Skeleton::UpdateSkeleton::UpdateSkeleton() : _needValidate(true) {}
 
 Skeleton::UpdateSkeleton::UpdateSkeleton(const UpdateSkeleton& us, const osg::CopyOp& copyop) :
     osg::Object(us, copyop),
+    osg::Callback(us, copyop),
     osg::NodeCallback(us, copyop)
 {
     _needValidate = true;

src/osgAnimation/StackedTransform.cpp

@@ -18,7 +18,8 @@ using namespace osgAnimation;
 
 StackedTransform::StackedTransform() {}
 
-StackedTransform::StackedTransform(const StackedTransform& rhs, const osg::CopyOp& co)
+StackedTransform::StackedTransform(const StackedTransform& rhs, const osg::CopyOp& co):
+    inherited(rhs)
 {
     reserve(rhs.size());
     for (StackedTransform::const_iterator it = rhs.begin(); it != rhs.end(); ++it)

src/osgAnimation/UpdateMatrixTransform.cpp

@@ -18,7 +18,10 @@
 
 using namespace osgAnimation;
 
-UpdateMatrixTransform::UpdateMatrixTransform( const UpdateMatrixTransform& apc,const osg::CopyOp& copyop) : osg::Object(apc,copyop), AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
+UpdateMatrixTransform::UpdateMatrixTransform( const UpdateMatrixTransform& apc,const osg::CopyOp& copyop) :
+    osg::Object(apc,copyop),
+    osg::Callback(apc,copyop),
+    AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
 {
     _transforms = StackedTransform(apc.getStackedTransforms(), copyop);
 }

src/osgDB/CMakeLists.txt

@@ -165,6 +165,14 @@ IF( ZLIB_FOUND )
     SET(COMPRESSION_LIBRARIES ZLIB_LIBRARY)
 ENDIF()
 
+################################################################################
+## Quieten warnings that a due to optional code paths
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -Wextra flag as it barfs on ffmoeg headers
+   STRING(REGEX REPLACE "-Wextra" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
 ADD_DEFINITIONS(-DOSG_PLUGIN_EXTENSION=${CMAKE_SHARED_MODULE_SUFFIX})
 
 SET(TARGET_LIBRARIES

src/osgDB/ClassInterface.cpp

@@ -59,8 +59,8 @@ public:
     virtual void writeFloat( float f ) { write(f); }
     virtual void writeDouble( double d ) { write(d); }
     virtual void writeString( const std::string& s ) { _str.insert(_str.end(), s.begin(), s.end()); }
-    virtual void writeStream( std::ostream& (*fn)(std::ostream&) ) {}
-    virtual void writeBase( std::ios_base& (*fn)(std::ios_base&) ) {}
+    virtual void writeStream( std::ostream& (*)(std::ostream&) ) {}
+    virtual void writeBase( std::ios_base& (*)(std::ios_base&) ) {}
     virtual void writeGLenum( const osgDB::ObjectGLenum& value ) { writeInt(value.get()); }
     virtual void writeProperty( const osgDB::ObjectProperty& prop ) { _propertyName = prop._name; }
     virtual void writeMark( const osgDB::ObjectMark& mark ) { _markName = mark._name; }
@@ -123,12 +123,12 @@ public:
     virtual void readDouble( double& d ) { read(d); }
     virtual void readString( std::string& s ) { s = std::string(_bufferData, _bufferSize); }
 
-    virtual void readStream( std::istream& (*fn)(std::istream&) ) {}
-    virtual void readBase( std::ios_base& (*fn)(std::ios_base&) ) {}
+    virtual void readStream( std::istream& (*)(std::istream&) ) {}
+    virtual void readBase( std::ios_base& (*)(std::ios_base&) ) {}
 
     virtual void readGLenum( ObjectGLenum& value ) { readUInt(value._value); }
-    virtual void readProperty( ObjectProperty& prop ) {}
-    virtual void readMark( ObjectMark& mark ) {}
+    virtual void readProperty( ObjectProperty& ) {}
+    virtual void readMark( ObjectMark&) {}
     virtual void readCharArray( char* s, unsigned int size ) { if ( size>0 ) _in->read( s, size ); }
     virtual void readWrappedString( std::string& str ) { readString(str); }
 
@@ -388,7 +388,7 @@ bool ClassInterface::copyPropertyDataToObject(osg::Object* object, const std::st
     }
 }
 
-bool ClassInterface::copyPropertyObjectFromObject(const osg::Object* object, const std::string& propertyName, void* valuePtr, unsigned int valueSize, osgDB::BaseSerializer::Type valueType)
+bool ClassInterface::copyPropertyObjectFromObject(const osg::Object* object, const std::string& propertyName, void* valuePtr, unsigned int /*valueSize*/, osgDB::BaseSerializer::Type valueType)
 {
     osgDB::BaseSerializer::Type sourceType;
     osgDB::BaseSerializer* serializer = getSerializer(object, propertyName, sourceType);
@@ -411,7 +411,7 @@ bool ClassInterface::copyPropertyObjectFromObject(const osg::Object* object, con
     }
 }
 
-bool ClassInterface::copyPropertyObjectToObject(osg::Object* object, const std::string& propertyName, const void* valuePtr, unsigned int valueSize, osgDB::BaseSerializer::Type valueType)
+bool ClassInterface::copyPropertyObjectToObject(osg::Object* object, const std::string& propertyName, const void* valuePtr, unsigned int /*valueSize*/, osgDB::BaseSerializer::Type valueType)
 {
     osgDB::BaseSerializer::Type destinationType;
     osgDB::BaseSerializer* serializer = getSerializer(object, propertyName, destinationType);

src/osgGA/CameraManipulator.cpp

@@ -21,7 +21,9 @@ CameraManipulator::CameraManipulator()
 
 
 CameraManipulator::CameraManipulator(const CameraManipulator& mm, const CopyOp& copyOp)
-   : inherited(mm, copyOp),
+   : osg::Object(mm, copyOp),
+     osg::Callback(mm, copyOp),
+     inherited(mm, copyOp),
      _intersectTraversalMask(mm._intersectTraversalMask),
      _autoComputeHomePosition(mm._autoComputeHomePosition),
      _homeEye(mm._homeEye),

src/osgGA/EventHandler.cpp

@@ -45,7 +45,7 @@ void EventHandler::event(osg::NodeVisitor* nv, osg::Drawable* drawable)
     }
 }
 
-bool EventHandler::handle(osgGA::Event* event, osg::Object* object, osg::NodeVisitor* nv)
+bool EventHandler::handle(osgGA::Event* event, osg::Object* /*object*/, osg::NodeVisitor* /*nv*/)
 {
     OSG_NOTICE<<"Handle event "<<event<<std::endl;
     return false;

src/osgGA/FirstPersonManipulator.cpp

@@ -44,7 +44,8 @@ FirstPersonManipulator::FirstPersonManipulator( int flags )
 
 /// Constructor.
 FirstPersonManipulator::FirstPersonManipulator( const FirstPersonManipulator& fpm, const CopyOp& copyOp )
-   : osg::Callback(fpm, copyOp),
+    : osg::Object(fpm, copyOp),
+     osg::Callback(fpm, copyOp),
      inherited( fpm, copyOp ),
      _eye( fpm._eye ),
      _rotation( fpm._rotation ),

src/osgGA/FlightManipulator.cpp

@@ -28,7 +28,8 @@ FlightManipulator::FlightManipulator( int flags )
 
 /// Constructor.
 FlightManipulator::FlightManipulator( const FlightManipulator& fm, const CopyOp& copyOp )
-    : osg::Callback(fm, copyOp),
+    : osg::Object(fm, copyOp),
+      osg::Callback(fm, copyOp),
       inherited( fm, copyOp ),
       _yawMode( fm._yawMode )
 {

src/osgGA/MultiTouchTrackballManipulator.cpp

@@ -30,7 +30,7 @@ MultiTouchTrackballManipulator::MultiTouchTrackballManipulator( int flags )
 
 /// Constructor.
 MultiTouchTrackballManipulator::MultiTouchTrackballManipulator( const MultiTouchTrackballManipulator& tm, const CopyOp& copyOp )
-    : osg::Callback(tm, copyOp), inherited( tm, copyOp )
+    : osg::Object(tm, copyOp), osg::Callback(tm, copyOp), inherited( tm, copyOp )
 {
 }
 

src/osgGA/NodeTrackerManipulator.cpp

@@ -30,7 +30,8 @@ NodeTrackerManipulator::NodeTrackerManipulator( int flags )
 
 
 NodeTrackerManipulator::NodeTrackerManipulator( const NodeTrackerManipulator& m, const CopyOp& copyOp )
-    : osg::Callback(m, copyOp),
+    : osg::Object(m, copyOp),
+      osg::Callback(m, copyOp),
       inherited( m, copyOp ),
       _trackNodePath( m._trackNodePath ),
       _trackerMode( m._trackerMode )

src/osgGA/OrbitManipulator.cpp

@@ -43,7 +43,8 @@ OrbitManipulator::OrbitManipulator( int flags )
 
 /// Constructor.
 OrbitManipulator::OrbitManipulator( const OrbitManipulator& om, const CopyOp& copyOp )
-   : osg::Callback(om, copyOp),
+    : osg::Object(om, copyOp),
+     osg::Callback(om, copyOp),
      inherited( om, copyOp ),
      _center( om._center ),
      _rotation( om._rotation ),

src/osgGA/StandardManipulator.cpp

@@ -48,7 +48,9 @@ StandardManipulator::StandardManipulator( int flags )
 
 /// Constructor.
 StandardManipulator::StandardManipulator( const StandardManipulator& uim, const CopyOp& copyOp )
-    : inherited( uim, copyOp ),
+    : osg::Object(uim, copyOp),
+      osg::Callback(uim, copyOp),
+      inherited( uim, copyOp ),
       _thrown( uim._thrown ),
       _allowThrow( uim._allowThrow ),
       _mouseCenterX(0.0f), _mouseCenterY(0.0f),

src/osgGA/TerrainManipulator.cpp

@@ -29,7 +29,8 @@ TerrainManipulator::TerrainManipulator( int flags )
 
 /// Constructor.
 TerrainManipulator::TerrainManipulator( const TerrainManipulator& tm, const CopyOp& copyOp )
-    : osg::Callback(tm, copyOp),
+    : osg::Object(tm, copyOp),
+      osg::Callback(tm, copyOp),
       inherited( tm, copyOp ),
       _previousUp( tm._previousUp )
 {

src/osgGA/TrackballManipulator.cpp

@@ -28,7 +28,8 @@ TrackballManipulator::TrackballManipulator( int flags )
 
 /// Constructor.
 TrackballManipulator::TrackballManipulator( const TrackballManipulator& tm, const CopyOp& copyOp )
-    : osg::Callback(tm, copyOp),
+    : osg::Object(tm, copyOp),
+      osg::Callback(tm, copyOp),
       inherited( tm, copyOp )
 {
 }

src/osgGA/Widget.cpp

@@ -35,7 +35,7 @@ Widget::Widget():
 }
 
 Widget::Widget(const Widget& widget, const osg::CopyOp& copyop):
-    osg::Group(),
+    osg::Group(widget, copyop),
     _focusBehaviour(widget._focusBehaviour),
     _hasEventFocus(false),
     _graphicsInitialized(false)
@@ -277,7 +277,7 @@ bool Widget::handle(osgGA::EventVisitor* ev, osgGA::Event* event)
     }
 }
 
-bool Widget::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
+bool Widget::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* /*event*/)
 {
     return false;
 }

src/osgManipulator/AntiSquish.cpp

@@ -49,7 +49,7 @@ AntiSquish::~AntiSquish()
 }
 
 
-bool AntiSquish::computeLocalToWorldMatrix(osg::Matrix& matrix,osg::NodeVisitor* nv) const
+bool AntiSquish::computeLocalToWorldMatrix(osg::Matrix& matrix,osg::NodeVisitor* /*nv*/) const
 {
     osg::Matrix unsquishedMatrix;
     if ( !computeUnSquishedMatrix( unsquishedMatrix ) )

src/osgPlugins/3dc/ReaderWriter3DC.cpp

@@ -185,7 +185,7 @@ class ReaderWriter3DC : public osgDB::ReaderWriter
 
         }
 
-        virtual WriteResult writeNode(const osg::Node& node,const std::string& fileName,const Options* options =NULL) const
+        virtual WriteResult writeNode(const osg::Node& node,const std::string& fileName,const Options* /*options*/ =NULL) const
         {
             std::string ext = osgDB::getLowerCaseFileExtension(fileName);
             if( !acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED;

src/osgPlugins/3ds/ReaderWriter3DS.cpp

@@ -693,7 +693,7 @@ static size_t fileo_write_func(void *self, const void *buffer, size_t size)
     return f->fail() ? 0 : size;
 }
 
-static void fileio_log_func(void *self, Lib3dsLogLevel level, int indent, const char *msg)
+static void fileio_log_func(void* /*self*/, Lib3dsLogLevel level, int /*indent*/, const char *msg)
 {
     osg::NotifySeverity l = osg::INFO;
     // Intentionally NOT mapping 3DS levels with OSG levels

src/osgPlugins/3ds/WriterNodeVisitor.cpp

@@ -145,14 +145,14 @@ public:
 
       virtual void setVertexArray(unsigned int,const osg::Vec2*) {}
 
-      virtual void setVertexArray(unsigned int count,const osg::Vec3* vecs) {}
+      virtual void setVertexArray(unsigned int,const osg::Vec3*) {}
 
-      virtual void setVertexArray(unsigned int,const osg::Vec4* ) {}
+      virtual void setVertexArray(unsigned int,const osg::Vec4*) {}
 
       virtual void setVertexArray(unsigned int,const osg::Vec2d*) {}
 
-      virtual void setVertexArray(unsigned int ,const osg::Vec3d* ) {}
-      virtual void setVertexArray(unsigned int,const osg::Vec4d* ) {}
+      virtual void setVertexArray(unsigned int ,const osg::Vec3d*) {}
+      virtual void setVertexArray(unsigned int,const osg::Vec4d*) {}
 
 
       // operator for triangles

src/osgPlugins/OpenFlight/LightPointRecords.cpp

@@ -447,7 +447,7 @@ protected:
 
     virtual ~LightPointSystem() {}
 
-    virtual void readRecord(RecordInputStream& in, Document& document)
+    virtual void readRecord(RecordInputStream& in, Document& /*document*/)
     {
         std::string id = in.readString(8);
 
@@ -483,7 +483,7 @@ protected:
             _parent->addChild(*((osg::Group*)_switch.get()));
     }
 
-    virtual void dispose(Document& document)
+    virtual void dispose(Document& /*document*/)
     {
         if (!_switch.valid()) return;
 

src/osgPlugins/OpenFlight/PrimaryRecords.cpp

@@ -767,7 +767,7 @@ public:
 protected:
 
     virtual ~InstanceDefinition() {}
-    virtual void readRecord(RecordInputStream& in, Document& document)
+    virtual void readRecord(RecordInputStream& in, Document& /*document*/)
     {
         in.forward(2);
         _number = (int)in.readUInt16();

src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp

@@ -185,7 +185,7 @@ ReaderWriter::ReadResult ReaderWriterATTR::readObject(const std::string& file, c
 
 
 ReaderWriter::WriteResult
-ReaderWriterATTR::writeObject(const osg::Object& object, const std::string& fileName, const Options* options) const
+ReaderWriterATTR::writeObject(const osg::Object& object, const std::string& fileName, const Options* /*options*/) const
 {
     using std::ios;
 

src/osgPlugins/OpenFlight/VertexPaletteManager.cpp

@@ -172,7 +172,7 @@ VertexPaletteManager::write( DataOutputStream& dos ) const
 
 
 VertexPaletteManager::PaletteRecordType
-VertexPaletteManager::recordType( const osg::Array* v, const osg::Array* c,
+VertexPaletteManager::recordType( const osg::Array* /*v*/, const osg::Array* /*c*/,
     const osg::Array* n, const osg::Array* t )
 {
     if (t)

src/osgPlugins/OpenFlight/expGeometryRecords.cpp

@@ -50,7 +50,7 @@ static unsigned int LAYER_7( 0x80000000 >> 6 );
 
 
 bool
-FltExportVisitor::isLit( const osg::Geometry& geom ) const
+FltExportVisitor::isLit( const osg::Geometry& /*geom*/ ) const
 {
     const osg::StateSet* ss = getCurrentStateSet();
     if ( ss->getMode( GL_LIGHTING ) & osg::StateAttribute::ON )

src/osgPlugins/ac/Geode.cpp

@@ -659,7 +659,7 @@ void Geode::OutputPolygonDelsUInt(const int iCurrentMaterial, const unsigned int
 }
 
 
-const int Geode::ProcessMaterial(ostream& fout, const unsigned int igeode)
+int Geode::ProcessMaterial(ostream& fout, const unsigned int igeode)
 {
     // outputs materials from one geode
     // extended for multiple geode models, GWM 2003.

src/osgPlugins/ac/Geode.h

@@ -9,7 +9,7 @@ namespace ac3d
     class Geode : public osg::Geode
     {
     public:
-        const int ProcessMaterial(std::ostream& fout, const unsigned int igeode);
+        int ProcessMaterial(std::ostream& fout, const unsigned int igeode);
         void ProcessGeometry(std::ostream& fout, const unsigned int igeode);
     private:
         void OutputTriangle(const int iCurrentMaterial,const unsigned int surfaceFlags,

src/osgPlugins/ac/ac3d.cpp

@@ -768,7 +768,7 @@ class LineBin : public PrimitiveBin
         return true;
     }
 
-    virtual osg::Geode* finalize(const MaterialData& material, const TextureData& textureData)
+    virtual osg::Geode* finalize(const MaterialData& material, const TextureData& /*textureData*/)
     {
         _geode->addDrawable(_geometry.get());
         material.toStateSet(_geode->getOrCreateStateSet());

src/osgPlugins/cfg/ConfigParser.cpp

@@ -1118,6 +1118,7 @@ yydestruct (yytype, yyvaluep)
 #endif
 {
   /* Pacify ``unused variable'' warnings.  */
+  (void) yytype;
   (void) yyvaluep;
 
 }

src/osgPlugins/cfg/ReaderWriterCFG.cpp

@@ -91,7 +91,7 @@ static osg::GraphicsContext::Traits* buildTrait(RenderSurface& rs)
     return traits;
  }
 
-static osgViewer::View* load(const std::string& file, const osgDB::ReaderWriter::Options* option)
+static osgViewer::View* load(const std::string& file, const osgDB::ReaderWriter::Options* /*option*/)
 {
     osg::ref_ptr<CameraConfig> config = new CameraConfig;
     //std::cout << "Parse file " << file << std::endl;

src/osgPlugins/cfg/RenderSurface.cpp

@@ -258,7 +258,7 @@ int  RenderSurface::getScreenNum( void ) const
     return _screen;
 }
 
-void RenderSurface::setWindowRectangle( int x, int y, unsigned int width, unsigned int height, bool resize)
+void RenderSurface::setWindowRectangle( int x, int y, unsigned int width, unsigned int height, bool /*resize*/)
 {
     if( _useCustomFullScreen )
     {

src/osgPlugins/curl/ReaderWriterCURL.cpp

@@ -378,7 +378,7 @@ ReaderWriterCURL::ReaderWriterCURL()
     supportsProtocol("https","Read from https port using libcurl.");
     supportsProtocol("ftp","Read from ftp port using libcurl.");
     supportsProtocol("ftps","Read from ftps port using libcurl.");
-    
+
     supportsExtension("curl","Pseudo file extension, used to select curl plugin.");
     supportsExtension("*","Passes all read files to other plugins to handle actual model loading.");
     supportsOption("OSG_CURL_PROXY","Specify the http proxy.");
@@ -706,8 +706,7 @@ bool ReaderWriterCURL::read(std::istream& fin, std::string& destination) const
 }
 #endif
 
-size_t empty_write_data(const char *buffer, size_t size, size_t nmemb, char
-*userp)
+size_t empty_write_data(const char* /*buffer*/, size_t size, size_t nmemb, char* /*userp*/)
 {
     return size*nmemb;
 }
@@ -726,12 +725,12 @@ bool ReaderWriterCURL::fileExists(const std::string& filename, const osgDB::Opti
         curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, &empty_write_data);
 
         int result = curl_easy_perform(curl_handle);
-        
+
         long http_return_code(0);
         curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &http_return_code);
-        
+
         curl_easy_cleanup(curl_handle);
-        
+
         return ((result == 0) && ((http_return_code == 200) || (http_return_code == 0)));
     }
     else

src/osgPlugins/curl/ReaderWriterCURL.h

@@ -79,7 +79,7 @@ class EasyCurl : public osg::Referenced
         virtual ~EasyCurl();
 
         // disallow copying
-        EasyCurl(const EasyCurl& rhs):_curl(rhs._curl) {}
+        EasyCurl(const EasyCurl& rhs) : osg::Referenced(rhs), _curl(rhs._curl) {}
         EasyCurl& operator = (const EasyCurl&) { return *this; }
 
         void setOptions(const std::string& proxyAddress, const std::string& fileName, StreamObject& sp, const osgDB::ReaderWriter::Options *options);

src/osgPlugins/dae/CMakeLists.txt

@@ -1,5 +1,15 @@
 INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4)
 
+
+################################################################################
+## Quieten warnings that a due to dae headers
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -Wextra flag as it barfs on ffmoeg headers
+   STRING(REGEX REPLACE "-Wextra" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
+
 SET(TARGET_SRC
     daeReader.cpp
     daeRAnimations.cpp

src/osgPlugins/dicom/ReaderWriterDICOM.cpp

@@ -255,7 +255,7 @@ class ReaderWriterDICOM : public osgDB::ReaderWriter
         }
 
 
-        virtual ReadResult readImage(std::istream& fin,const osgDB::ReaderWriter::Options*) const
+        virtual ReadResult readImage(std::istream&,const osgDB::ReaderWriter::Options*) const
         {
             return 0;
         }

src/osgPlugins/dot/BaseDotVisitor.cpp

@@ -140,17 +140,13 @@ namespace osgDot {
 
   }
 
-  void BaseDotVisitor::handle(osg::Node& node, int id) {
-  }
+  void BaseDotVisitor::handle(osg::Node&, int) {}
 
-  void BaseDotVisitor::handle(osg::Geode& node, int id) {
-  }
+  void BaseDotVisitor::handle(osg::Geode&, int) {}
 
-  void BaseDotVisitor::handle(osg::Group& node, int id) {
-  }
+  void BaseDotVisitor::handle(osg::Group&, int) {}
 
-  void BaseDotVisitor::handle(osg::Group& parent, osg::Node& child, int parentID, int childID ) {
-  }
+  void BaseDotVisitor::handle(osg::Group&, osg::Node&, int, int) {}
 
   void BaseDotVisitor::handleNodeAndTraverse(osg::Node& node, int id) {
     osg::StateSet* ss = node.getStateSet();
@@ -164,20 +160,15 @@ namespace osgDot {
     traverse(node);
   }
 
-  void BaseDotVisitor::handle(osg::StateSet& stateset, int id) {
-  }
+  void BaseDotVisitor::handle(osg::StateSet&, int) {}
 
-  void BaseDotVisitor::handle(osg::Node& node, osg::StateSet& stateset, int parentID, int childID) {
-  }
+  void BaseDotVisitor::handle(osg::Node&, osg::StateSet&, int, int) {}
 
-  void BaseDotVisitor::handle(osg::Drawable& drawable, int id) {
-  }
+  void BaseDotVisitor::handle(osg::Drawable&, int) {}
 
-  void BaseDotVisitor::handle(osg::Drawable& drawable, osg::StateSet& stateset, int parentID, int childID ) {
-  }
+  void BaseDotVisitor::handle(osg::Drawable&, osg::StateSet&, int, int) {}
 
-  void BaseDotVisitor::handle(osg::Geode& geode, osg::Drawable& drawable, int parentID, int childID ) {
-  }
+  void BaseDotVisitor::handle(osg::Geode&, osg::Drawable&, int, int) {}
 
   bool BaseDotVisitor::getOrCreateId( osg::Object* object, int &id ) {
     assert( object );

src/osgPlugins/dot/SimpleDotVisitor.cpp

@@ -42,7 +42,7 @@ namespace osgDot {
     drawNode( id, "record", "solid", label.str(), "black", "white" );
   }
 
-  void SimpleDotVisitor::handle(osg::Group& parent, osg::Node& child, int parentID, int childID ) {
+  void SimpleDotVisitor::handle(osg::Group&, osg::Node&, int parentID, int childID ) {
     drawEdge( parentID, childID, "setlinewidth(2)" );
   }
 
@@ -53,7 +53,7 @@ namespace osgDot {
     drawNode( id, "Mrecord", "solid", label.str(), "green", "white" );
   }
 
-  void SimpleDotVisitor::handle(osg::Node& node, osg::StateSet& stateset, int parentID, int childID ) {
+  void SimpleDotVisitor::handle(osg::Node&, osg::StateSet&, int parentID, int childID ) {
     drawEdge( parentID, childID, "dashed" );
   }
 
@@ -64,11 +64,11 @@ namespace osgDot {
     drawNode( id, "record", "solid", label.str(), "blue", "white" );
   }
 
-  void SimpleDotVisitor::handle(osg::Geode& geode, osg::Drawable& drawable, int parentID, int childID ) {
+  void SimpleDotVisitor::handle(osg::Geode&, osg::Drawable&, int parentID, int childID ) {
     drawEdge( parentID, childID, "dashed" );
   }
 
-  void SimpleDotVisitor::handle(osg::Drawable& drawable, osg::StateSet& stateset, int parentID, int childID ) {
+  void SimpleDotVisitor::handle(osg::Drawable&, osg::StateSet&, int parentID, int childID ) {
     drawEdge( parentID, childID, "dashed" );
   }
 

src/osgPlugins/dw/ReaderWriterDW.cpp

@@ -331,7 +331,7 @@ public:
           GLUtesselator *ts, _dwobj *dwob, const RefMatrix *tmat) const;
 
     void link(const int idop, const _face *f2, const int idop2,const std::vector<Vec3> verts, const dwmaterial *themat) const; // to join up opposed faces of a hole
-    inline const int getidx(int i) const { return idx[i];}
+    inline int getidx(int i) const { return idx[i];}
 private:
     void linkholes(const std::vector<Vec3> verts, const dwmaterial *themat, const _face *f2) const;
     void reverse() { // reverse order of the vertices

src/osgPlugins/dxf/DXFWriterNodeVisitor.h

@@ -229,7 +229,7 @@ class DXFWriterNodeVisitor: public osg::NodeVisitor {
             }
         }
 
-        int getNodeAcadColor(osg::Geometry *geo,int index=0) { return 0;}
+        int getNodeAcadColor(osg::Geometry* /*geo*/,int /*index*/=0) { return 0;}
 
     protected:
         struct CompareStateSet

src/osgPlugins/dxf/ReaderWriterDXF.cpp

@@ -77,7 +77,7 @@ public:
         return WriteResult(WriteResult::FILE_SAVED);
     }
 
-    virtual WriteResult writeNode(const osg::Node& node,const std::string& fileName,const Options* options =NULL) const
+    virtual WriteResult writeNode(const osg::Node& node,const std::string& fileName,const Options* /*options*/ =NULL) const
     {
         if (!acceptsExtension(osgDB::getFileExtension(fileName)))
             return WriteResult(WriteResult::FILE_NOT_HANDLED);

src/osgPlugins/dxf/dxfEntity.h

@@ -186,10 +186,10 @@ public:
     virtual void assign(dxfFile* dxf, codeValue& cv);
     void getVertex(double &x, double &y, double &z) { x=_vertex.x();y=_vertex.y();z=_vertex.z(); }
     const osg::Vec3d& getVertex() const { return _vertex; }
-    const unsigned int getIndice1() const { return _indice1; }
-    const unsigned int getIndice2() const { return _indice2; }
-    const unsigned int getIndice3() const { return _indice3; }
-    const unsigned int getIndice4() const { return _indice4; }
+    unsigned int getIndice1() const { return _indice1; }
+    unsigned int getIndice2() const { return _indice2; }
+    unsigned int getIndice3() const { return _indice3; }
+    unsigned int getIndice4() const { return _indice4; }
 
 protected:
     osg::Vec3d    _vertex;

src/osgPlugins/ffmpeg/FFmpegHeaders.hpp

@@ -23,7 +23,7 @@ extern "C"
 
 #  include <libavutil/opt.h>
 
-  inline AVAudioResampleContext * swr_alloc_set_opts_proxy(SwrContext *ctx, int64_t out_ch_layout, enum AVSampleFormat out_sample_format, int out_sample_rate, int64_t in_ch_layout, enum AVSampleFormat in_sample_format, int in_sample_rate, int /*log_offset*/, void * /*log_ctx*/)
+  inline AVAudioResampleContext * swr_alloc_set_opts_proxy(SwrContext* /*ctx*/, int64_t out_ch_layout, enum AVSampleFormat out_sample_format, int out_sample_rate, int64_t in_ch_layout, enum AVSampleFormat in_sample_format, int in_sample_rate, int /*log_offset*/, void * /*log_ctx*/)
   {
     AVAudioResampleContext *avr = avresample_alloc_context();
     av_opt_set_int(avr, "in_channel_layout",  in_ch_layout, 0);

src/osgPlugins/ffmpeg/FFmpegImageStream.cpp

@@ -33,7 +33,8 @@ FFmpegImageStream::FFmpegImageStream() :
 
 
 FFmpegImageStream::FFmpegImageStream(const FFmpegImageStream & image, const osg::CopyOp & copyop) :
-    osg::ImageStream(image, copyop)
+    osg::ImageStream(image, copyop),
+    OpenThreads::Thread()
 {
     // TODO: probably incorrect or incomplete
 }

src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp

@@ -28,7 +28,7 @@
 
 extern "C" {
 
-static void log_to_osg(void *ptr, int level, const char *fmt, va_list vl)
+static void log_to_osg(void* /*ptr*/, int level, const char *fmt, va_list vl)
 {
     char logbuf[256];
     vsnprintf(logbuf, sizeof(logbuf), fmt, vl);

src/osgPlugins/gdal/DataSetLayer.cpp

@@ -37,7 +37,7 @@ _dataset(0), _gdalReader(0)
 }
 
 DataSetLayer::DataSetLayer(const DataSetLayer& dataSetLayer,const osg::CopyOp& copyop):
-    Layer(dataSetLayer), _gdalReader(dataSetLayer._gdalReader)
+    Layer(dataSetLayer, copyop), _gdalReader(dataSetLayer._gdalReader)
 {
     if (dataSetLayer._dataset) open();
 }

src/osgPlugins/gles/GeometryUniqueVisitor

@@ -44,7 +44,7 @@ public:
         apply(*geometry);
     }
 
-    virtual void apply(osg::Geometry& geometry) {} // to be implemented by actual visitors
+    virtual void apply(osg::Geometry& /*geometry*/) {} // to be implemented by actual visitors
 
 protected:
     bool isProcessed(osg::Geometry* node) {

src/osgPlugins/lua/LuaScriptEngine.cpp

@@ -1843,7 +1843,7 @@ LuaScriptEngine::LuaScriptEngine():
     initialize();
 }
 
-LuaScriptEngine::LuaScriptEngine(const LuaScriptEngine& rhs, const osg::CopyOp&):
+LuaScriptEngine::LuaScriptEngine(const LuaScriptEngine&, const osg::CopyOp&):
     osg::ScriptEngine("lua"),
     _lua(0),
     _scriptCount(0)

src/osgPlugins/lua/ReaderWriterLua.cpp

@@ -160,7 +160,7 @@ class ReaderWriterLua : public osgDB::ReaderWriter
             return readNode(istream, local_opt.get());
         }
 
-        virtual ReadResult readScript(std::istream& fin,const osgDB::ReaderWriter::Options* options =NULL) const
+        virtual ReadResult readScript(std::istream& fin,const osgDB::ReaderWriter::Options* /*options*/ =NULL) const
         {
             osg::ref_ptr<osg::Script> script = new osg::Script;
             script->setLanguage("lua");

src/osgPlugins/mdl/MDLReader.cpp

@@ -103,8 +103,7 @@ MDLReader::~MDLReader()
 }
 
 
-std::string MDLReader::getToken(std::string str, const char * delim,
-                                size_t & index)
+std::string MDLReader::getToken(std::string str, const char * /*delim*/, size_t & index)
 {
     size_t start;
     size_t end = std::string::npos;

src/osgPlugins/nvtt/NVTTImageProcessor.cpp

@@ -155,7 +155,7 @@ bool NVTTProcessor::OSGImageOutputHandler::assignImage(osg::Image& image)
 }
 
 /// Indicate the start of a new compressed image that's part of the final texture.
-void NVTTProcessor::OSGImageOutputHandler::beginImage(int size, int width, int height, int depth, int face, int miplevel)
+void NVTTProcessor::OSGImageOutputHandler::beginImage(int size, int width, int height, int /*depth*/, int /*face*/, int miplevel)
 {
     // store the new width/height of the texture
     if (miplevel == 0)

src/osgPlugins/obj/ReaderWriterOBJ.cpp

@@ -89,7 +89,7 @@ public:
             return WriteResult(WriteResult::FILE_NOT_HANDLED);
     }
 
-    virtual WriteResult writeNode(const osg::Node& node,const std::string& fileName,const Options* options =NULL) const
+    virtual WriteResult writeNode(const osg::Node& node,const std::string& fileName,const Options* /*options*/ =NULL) const
     {
         if (!acceptsExtension(osgDB::getFileExtension(fileName)))
             return WriteResult(WriteResult::FILE_NOT_HANDLED);

src/osgPlugins/ogr/ReaderWriterOGR.cpp

@@ -71,7 +71,8 @@ struct TriangulizeFunctor
     osg::Vec3Array* _vertexes;
 
     // do nothing
-    void operator ()(const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3, bool treatVertexDataAsTemporary) {
+    void operator ()(const osg::Vec3& v1, const osg::Vec3& v2, const osg::Vec3& v3, bool /*treatVertexDataAsTemporary*/)
+    {
         _vertexes->push_back(v1);
         _vertexes->push_back(v2);
         _vertexes->push_back(v3);
@@ -145,9 +146,9 @@ public:
             GDALAllRegister();
 
         // Try to open data source
-        GDALDataset* file  = (GDALDataset*) GDALOpenEx( fileName.c_str(), GDAL_OF_VECTOR, NULL, NULL, NULL );        
+        GDALDataset* file  = (GDALDataset*) GDALOpenEx( fileName.c_str(), GDAL_OF_VECTOR, NULL, NULL, NULL );
 #endif
-        
+
         if (!file)
             return 0;
 
@@ -165,7 +166,7 @@ public:
 
         osg::Group* group = new osg::Group;
 
-#if GDAL_VERSION_MAJOR<2        
+#if GDAL_VERSION_MAJOR<2
         for (int i = 0; i < file->GetLayerCount(); i++)
         {
             osg::Group* node = readLayer(file->GetLayer(i), file->GetName(), useRandomColorByFeature, addGroupPerFeature);
@@ -176,18 +177,18 @@ public:
 #else
         for (int i = 0; i < GDALDatasetGetLayerCount(file); i++)
         {
-            OGRLayer* layer = (OGRLayer *)GDALDatasetGetLayer(file, i); 
+            OGRLayer* layer = (OGRLayer *)GDALDatasetGetLayer(file, i);
             osg::Group* node = readLayer(layer, layer->GetName(), useRandomColorByFeature, addGroupPerFeature);
             if (node)
                 group->addChild( node );
         }
         GDALClose( file );
-#endif        
-        
+#endif
+
         return group;
     }
 
-    osg::Group* readLayer(OGRLayer* ogrLayer, const std::string& name, bool useRandomColorByFeature, bool addGroupPerFeature) const
+    osg::Group* readLayer(OGRLayer* ogrLayer, const std::string& /*name*/, bool useRandomColorByFeature, bool addGroupPerFeature) const
     {
         if (!ogrLayer)
             return 0;

src/osgPlugins/osc/OscReceivingDevice.cpp

@@ -135,7 +135,7 @@ private:
 
 
 
-bool StandardRequestHandler::operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+bool StandardRequestHandler::operator()(const std::string& /*request_path*/, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
 {
     try
     {
@@ -298,7 +298,7 @@ public:
     {
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
         try {
             float x_min(-1.0f), y_min(-1.0f), x_max(1.0f), y_max(1.0f);
@@ -330,7 +330,7 @@ public:
     {
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
         try {
             bool increasing_upwards(false);
@@ -364,7 +364,7 @@ public:
     {
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
         try {
             osc::int32 keycode(0);
@@ -401,7 +401,7 @@ public:
     {
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
         try {
             osc::int32 keycode(0);
@@ -438,7 +438,7 @@ public:
     {
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
 
         try {
@@ -473,7 +473,7 @@ public:
     {
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
 
         try {
@@ -514,7 +514,7 @@ public:
     {
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
         float down(0.0f);
 
@@ -566,7 +566,7 @@ public:
         }
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
         float  x(0.0f), y(0.0f);
         osc::int32 btn(0);
@@ -619,7 +619,7 @@ public:
     {
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
         try {
             float pressure(0.0f);
@@ -650,7 +650,7 @@ public:
     {
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
         try {
             osc::int32 pt(osgGA::GUIEventAdapter::UNKNOWN);
@@ -684,7 +684,7 @@ public:
     {
     }
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& /*remoteEndPoint*/)
     {
         try {
             float rotation(0.0f), tilt_x(0.0f), tilt_y(0.0f);
@@ -744,7 +744,7 @@ public:
     }
 
 
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint)
     {
         // std::cout << m << std::endl;
 

src/osgPlugins/osc/OscReceivingDevice.hpp

@@ -17,7 +17,7 @@
 /**
  * OscReceivingDevice can be used to receive osg-events via OSC from other hosts/ applications
  * It can even translate custom osc-message to user-events with attached user-data.
- * 
+ *
  * It uses the TUIO 1.1 Cursor2D-profile to receive multitouch-events
  *
  * This device adds to every message-bundle a message-id, so you can check, if you miss events or similar.
@@ -26,20 +26,20 @@
  *    /my_user_event/value_1 23
  *    /my_user_event/value_2 42
  *
- * this will result in one osgGA:Event (when both messages are bundled) witht the name "/my_user_event", 
+ * this will result in one osgGA:Event (when both messages are bundled) witht the name "/my_user_event",
  * and two user-values (value_1 and value_2)
  * To get value_1 you'll do something like event->getUserValue("value_1", my_int);
- * 
- * Currently osg's user-data can not cast to different types, they have to match, so 
+ *
+ * Currently osg's user-data can not cast to different types, they have to match, so
  * event->getUserValue("value_1", my_string) will fail.
  *
  * The receiving device will try to combine multiple osc arguments intelligently, multiple osc-arguments are
  * bundled into Vec2, Vec3, Vec4 or Matrix, it depends on the number of arguments.
- 
+
  * TUIO-specific notes:
  * If multiple TUIO-applications are transmitting their touch-points to one oscReceivingDevice, all
- * touchpoints get multiplexed, so you'll get one event with x touchpoints. 
- * You can differentiate the specific applications by the touch_ids, the upper 16bits 
+ * touchpoints get multiplexed, so you'll get one event with x touchpoints.
+ * You can differentiate the specific applications by the touch_ids, the upper 16bits
  * are specific to an application, the lower 16bits contain the touch-id for that application.
  * If you need "better" separation, use multiple oscReceivingDevices listening on different ports.
  *
@@ -61,7 +61,7 @@ class OscReceivingDevice : public osgGA::Device, OpenThreads::Thread, osc::OscPa
 
 public:
     typedef OscSendingDevice::MsgIdType MsgIdType;
-    
+
     class RequestHandler : public osg::Referenced {
     public:
         RequestHandler(const std::string& request_path)
@@ -70,58 +70,58 @@ public:
             , _device(NULL)
         {
         }
-        
+
         virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint) = 0;
-        virtual void operator()(osgGA::EventQueue* queue) {}
-        
+        virtual void operator()(osgGA::EventQueue* /*queue*/) {}
+
         const std::string& getRequestPath() const { return _requestPath; }
-        
+
         virtual void describeTo(std::ostream& out) const
         {
             out << getRequestPath() << ": no description available";
         }
-        
+
     protected:
         virtual void setDevice(OscReceivingDevice* device) { _device = device; }
         OscReceivingDevice* getDevice() const { return _device; }
-            
+
         /// set the request-path, works only from the constructor
         void setRequestPath(const std::string& request_path) { _requestPath = request_path; }
-    
+
         void handleException(const osc::Exception& e)
         {
             OSG_WARN << "OscDevice :: error while handling " << getRequestPath() << ": " << e.what() << std::endl;
         }
-        
+
         double getLocalTime() const { return getDevice()->getEventQueue()->getTime(); }
     private:
         std::string _requestPath;
         OscReceivingDevice* _device;
     friend class OscReceivingDevice;
     };
-    
+
     typedef std::multimap<std::string, osg::ref_ptr<RequestHandler> > RequestHandlerMap;
-    
+
     OscReceivingDevice(const std::string& server_address, int listening_port);
     ~OscReceivingDevice();
-    
-        
+
+
     virtual void run();
-    
-    
+
+
     virtual void ProcessMessage( const osc::ReceivedMessage& m, const IpEndpointName& remoteEndpoint );
     virtual void ProcessPacket( const char *data, int size, const IpEndpointName& remoteEndpoint );
     virtual void ProcessBundle( const osc::ReceivedBundle& b, const IpEndpointName& remoteEndpoint );
     void addRequestHandler(RequestHandler* handler);
-    
+
     void describeTo(std::ostream& out) const;
-    
+
     friend std::ostream& operator<<(std::ostream& out, const OscReceivingDevice& device)
     {
         device.describeTo(out);
         return out;
     }
-    
+
     osgGA::Event* getOrCreateUserDataEvent()
     {
         if (!_userDataEvent.valid())
@@ -130,20 +130,20 @@ public:
         }
         return _userDataEvent.get();
     }
-    
+
     virtual const char* className() const { return "OSC receiving device"; }
-    
+
     void addHandleOnCheckEvents(RequestHandler* handler) { _handleOnCheckEvents.push_back(handler); }
-    
+
     virtual bool checkEvents() {
         osgGA::EventQueue* queue = getEventQueue();
-        
+
         for(std::vector<RequestHandler*>::iterator i = _handleOnCheckEvents.begin(); i != _handleOnCheckEvents.end(); ++i) {
             (*i)->operator()(queue);
         }
         return osgGA::Device::checkEvents();
     }
-    
+
 private:
     std::string _listeningAddress;
     unsigned int _listeningPort;
@@ -160,14 +160,14 @@ private:
 class SendKeystrokeRequestHandler : public OscReceivingDevice::RequestHandler {
 public:
     SendKeystrokeRequestHandler(const std::string& request_path, int key) : OscReceivingDevice::RequestHandler(request_path), _key(key) {}
-    virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& arguments, const IpEndpointName& remoteEndPoint)
+    virtual bool operator()(const std::string& /*request_path*/, const std::string& /*full_request_path*/, const osc::ReceivedMessage& /*arguments*/, const IpEndpointName& /*remoteEndPoint*/)
     {
         getDevice()->getEventQueue()->keyPress(_key);
         getDevice()->getEventQueue()->keyRelease(_key);
-        
+
         return true;
     }
-    
+
     virtual void describeTo(std::ostream& out) const
     {
         out << getRequestPath() << ": send KEY_DOWN + KEY_UP, code: 0x" << std::hex << _key << std::dec;

src/osgPlugins/osc/osc/OscReceivedElements.h

@@ -144,7 +144,7 @@ private:
 
 inline bool operator==(const ReceivedBundleElementIterator& lhs,
         const ReceivedBundleElementIterator& rhs )
-{	
+{
 	return lhs.IsEqualTo( rhs );
 }
 
@@ -162,8 +162,8 @@ public:
 		, argument_( argument ) {}
 
     friend class ReceivedMessageArgumentIterator;
-    
-	const char TypeTag() const { return *typeTag_; }
+
+    char TypeTag() const { return *typeTag_; }
 
     // the unchecked methods below don't check whether the argument actually
     // is of the specified type. they should only be used if you've already
@@ -220,7 +220,7 @@ public:
     bool IsBlob() const { return *typeTag_ == BLOB_TYPE_TAG; }
     void AsBlob( const void*& data, unsigned long& size ) const;
     void AsBlobUnchecked( const void*& data, unsigned long& size ) const;
-    
+
 private:
 	const char *typeTag_;
 	const char *argument_;
@@ -265,13 +265,13 @@ private:
 
 inline bool operator==(const ReceivedMessageArgumentIterator& lhs,
         const ReceivedMessageArgumentIterator& rhs )
-{	
+{
 	return lhs.IsEqualTo( rhs );
 }
 
 inline bool operator!=(const ReceivedMessageArgumentIterator& lhs,
         const ReceivedMessageArgumentIterator& rhs )
-{	
+{
 	return !( lhs == rhs );
 }
 
@@ -284,7 +284,7 @@ class ReceivedMessageArgumentStream{
         , end_( end ) {}
 
     ReceivedMessageArgumentIterator p_, end_;
-    
+
 public:
 
     // end of stream
@@ -309,7 +309,7 @@ public:
 
         rhs = (*p_++).AsInt32();
         return *this;
-    }     
+    }
 
     ReceivedMessageArgumentStream& operator>>( float& rhs )
     {
@@ -355,7 +355,7 @@ public:
         rhs = (*p_++).AsInt64();
         return *this;
     }
-    
+
     ReceivedMessageArgumentStream& operator>>( TimeTag& rhs )
     {
         if( Eos() )
@@ -382,7 +382,7 @@ public:
         (*p_++).AsBlob( rhs.data, rhs.size );
         return *this;
     }
-    
+
     ReceivedMessageArgumentStream& operator>>( const char*& rhs )
     {
         if( Eos() )
@@ -391,7 +391,7 @@ public:
         rhs = (*p_++).AsString();
         return *this;
     }
-    
+
     ReceivedMessageArgumentStream& operator>>( Symbol& rhs )
     {
         if( Eos() )
@@ -401,7 +401,7 @@ public:
         return *this;
     }
 
-    ReceivedMessageArgumentStream& operator>>( MessageTerminator& rhs )
+    ReceivedMessageArgumentStream& operator>>( MessageTerminator& /*rhs*/ )
     {
         if( !Eos() )
             throw ExcessArgumentException();
@@ -429,12 +429,12 @@ public:
 
 
     typedef ReceivedMessageArgumentIterator const_iterator;
-    
+
 	ReceivedMessageArgumentIterator ArgumentsBegin() const
     {
         return ReceivedMessageArgumentIterator( typeTagsBegin_, arguments_ );
     }
-     
+
 	ReceivedMessageArgumentIterator ArgumentsEnd() const
     {
         return ReceivedMessageArgumentIterator( typeTagsEnd_, 0 );
@@ -464,12 +464,12 @@ public:
     unsigned long ElementCount() const { return elementCount_; }
 
     typedef ReceivedBundleElementIterator const_iterator;
-    
+
 	ReceivedBundleElementIterator ElementsBegin() const
     {
         return ReceivedBundleElementIterator( timeTag_ + 8 );
     }
-     
+
 	ReceivedBundleElementIterator ElementsEnd() const
     {
         return ReceivedBundleElementIterator( end_ );

src/osgPlugins/osgjs/JSON_Objects

@@ -40,7 +40,7 @@ struct JSONObjectBase : public osg::Referenced
 {
     static int level;
     static std::string indent();
-    virtual void write(json_stream& str, WriteVisitor& visitor) {}
+    virtual void write(json_stream& /*str*/, WriteVisitor& /*visitor*/) {}
 };
 
 template <class T> struct JSONValue;
@@ -144,7 +144,7 @@ struct JSONValue : public JSONObject
         _value = v;
     }
     T& getValue() { return _value; }
-    virtual void write(json_stream& str, WriteVisitor& visitor) {
+    virtual void write(json_stream& str, WriteVisitor& /*visitor*/) {
         str << _value ;
     }
 
@@ -157,7 +157,7 @@ struct JSONValue<double> : public JSONObject
     JSONValue(const double& v) {
         _value = v;
     }
-    void write(json_stream& str, WriteVisitor& visitor) {
+    void write(json_stream& str, WriteVisitor& /*visitor*/) {
         if (osg::isNaN(_value)) {
             _value = 0.0;
         }
@@ -174,7 +174,7 @@ struct JSONValue<std::string> : public JSONObject
         _value = jsonEscape(v);
     }
 
-    void write(json_stream& str, WriteVisitor& visitor) {
+    void write(json_stream& str, WriteVisitor& /*visitor*/) {
         str << '"' << _value  << '"';
     }
 

src/osgPlugins/p3d/ReaderWriterPaths.cpp

@@ -123,7 +123,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(std::istream& fin,
     return ReadResult::FILE_NOT_HANDLED;
 }
 
-osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_material(std::istream& fin, const osgDB::Options* options) const
+osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_material(std::istream& fin, const osgDB::Options* /*options*/) const
 {
     osg::ref_ptr<osgPresentation::AnimationMaterial> animationMaterial = new osgPresentation::AnimationMaterial;
     animationMaterial->read(fin);
@@ -131,14 +131,14 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_material(std::istream& f
     return animationMaterial.get();
 }
 
-osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_path(std::istream& fin, const osgDB::Options* options) const
+osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_path(std::istream& fin, const osgDB::Options* /*options*/) const
 {
     osg::ref_ptr<osg::AnimationPath> animation = new osg::AnimationPath;
     animation->read(fin);
     return animation.get();
 }
 
-osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_pivot_path(std::istream& fin, const osgDB::Options* options) const
+osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_pivot_path(std::istream& fin, const osgDB::Options* /*options*/) const
 {
     osg::ref_ptr<osg::AnimationPath> animation = new osg::AnimationPath;
 
@@ -203,7 +203,7 @@ struct RotationPathData
 
 };
 
-osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_rotation_path(std::istream& fin, const osgDB::Options* options) const
+osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_rotation_path(std::istream& fin, const osgDB::Options* /*options*/) const
 {
     osg::ref_ptr<osg::AnimationPath> animation = new osg::AnimationPath;
 

src/osgPlugins/png/ReaderWriterPNG.cpp

@@ -49,7 +49,7 @@ private:
     std::string _message;
 };
 
-void user_error_fn(png_structp png_ptr, png_const_charp error_msg)
+void user_error_fn(png_structp /*png_ptr*/, png_const_charp error_msg)
 {
 #ifdef OSG_CPP_EXCEPTIONS_AVAILABLE
     throw PNGError(error_msg);
@@ -58,7 +58,7 @@ void user_error_fn(png_structp png_ptr, png_const_charp error_msg)
 #endif
 }
 
-void user_warning_fn(png_structp png_ptr, png_const_charp warning_msg)
+void user_warning_fn(png_structp /*png_ptr*/, png_const_charp warning_msg)
 {
     OSG_WARN << "PNG lib warning : " << warning_msg << std::endl;
 }

src/osgPlugins/qfont/ReaderQFont.cpp

@@ -33,7 +33,7 @@ class ReaderQFont : public osgDB::ReaderWriter
 
         virtual const char* className() const { return "QFont Font Reader"; }
 
-        virtual ReadResult readObject(const std::string& file, const osgDB::ReaderWriter::Options* options) const
+        virtual ReadResult readObject(const std::string& file, const osgDB::ReaderWriter::Options* /*options*/) const
         {
             if (!acceptsExtension(osgDB::getLowerCaseFileExtension(file)))
                 return ReadResult::FILE_NOT_HANDLED;

src/osgPlugins/revisions/ReaderWriterRevisions.cpp

@@ -48,7 +48,7 @@ class ReaderWriterRevisions : public osgDB::ReaderWriter
             else return readFileList(fin, fileName, options);
         }
 
-        ReadResult readFileList(std::istream& fin, const std::string& name, const osgDB::ReaderWriter::Options* options) const
+        ReadResult readFileList(std::istream& fin, const std::string& name, const osgDB::ReaderWriter::Options* /*options*/) const
         {
             OSG_INFO<<"    readFileList="<<name<<std::endl;
 

src/osgPlugins/stl/ReaderWriterSTL.cpp

@@ -346,7 +346,7 @@ private:
             osg::Matrix m_mat;
             bool m_dontSaveNormals;
 
-            inline void operator () (const osg::Vec3& _v1, const osg::Vec3& _v2, const osg::Vec3& _v3, bool treatVertexDataAsTemporary)
+            inline void operator () (const osg::Vec3& _v1, const osg::Vec3& _v2, const osg::Vec3& _v3, bool /*treatVertexDataAsTemporary*/)
             {
                 osg::Vec3 v1 = _v1 * m_mat;
                 osg::Vec3 v2 = _v2 * m_mat;

src/osgPlugins/txp/TXPParser.h

@@ -180,7 +180,7 @@ public:
 
 
     // Returns true if we are under billboard subgraph
-    inline const bool underBillboardSubgraph() const
+    inline bool underBillboardSubgraph() const
     {
         return _underBillboardSubgraph;
     }
@@ -216,7 +216,7 @@ public:
     DeferredLightAttribute& getLightAttribute(int ix);
 
     // Returns if we are under layer subgraph
-    inline const bool underLayerSubgraph() const
+    inline bool underLayerSubgraph() const
     {
         return _underLayerSubgraph;
     }

src/osgPlugins/vtf/ReaderWriterVTF.cpp

@@ -702,7 +702,7 @@ osg::Image* ReadVTFFile(std::istream& _istream)
 }
 
 
-bool WriteVTFFile(const osg::Image *img, std::ostream& fout)
+bool WriteVTFFile(const osg::Image* /*img*/, std::ostream& /*fout*/)
 {
     // Not supported
     return false;

src/osgPlugins/zip/ReaderWriterZIP.cpp

@@ -20,7 +20,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter
         virtual const char* className() const { return "ZIP Database Reader/Writer"; }
 
 
-        virtual ReadResult openArchive(const std::string& file,ArchiveStatus status, unsigned int indexBlockSize = 4096, const Options* options = NULL) const
+        virtual ReadResult openArchive(const std::string& file,ArchiveStatus /*status*/, unsigned int /*indexBlockSize*/ = 4096, const Options* options = NULL) const
         {
 
             std::string ext = osgDB::getLowerCaseFileExtension(file);

src/osgPlugins/zip/ZipArchive.cpp

@@ -111,7 +111,7 @@ bool ZipArchive::getFileNames(osgDB::Archive::FileNameList& fileNameList) const
     }
 }
 
-bool ZipArchive::open(const std::string& file, ArchiveStatus status, const osgDB::ReaderWriter::Options* options)
+bool ZipArchive::open(const std::string& file, ArchiveStatus /*status*/, const osgDB::ReaderWriter::Options* options)
 {
     if ( !_zipLoaded )
     {
@@ -371,7 +371,7 @@ osgDB::ReaderWriter::WriteResult ZipArchive::writeShader(const osg::Shader& /*sh
 }
 
 
-osgDB::ReaderWriter* ZipArchive::ReadFromZipEntry(const ZIPENTRY* ze, const osgDB::ReaderWriter::Options* options, std::stringstream& buffer) const
+osgDB::ReaderWriter* ZipArchive::ReadFromZipEntry(const ZIPENTRY* ze, const osgDB::ReaderWriter::Options* /*options*/, std::stringstream& buffer) const
 {
     if (ze != 0)
     {

src/osgPresentation/SlideShowConstructor.cpp

@@ -2564,7 +2564,7 @@ struct VolumeSettingsCallback : public osgGA::GUIEventHandler
     int _saveKey;
     int _editKey;
 
-    bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object* object, osg::NodeVisitor* nv)
+    bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& /*aa*/, osg::Object* object, osg::NodeVisitor* /*nv*/)
     {
         if (ea.getHandled()) return false;
 

src/osgShadow/CMakeLists.txt

@@ -5,6 +5,15 @@ ELSE()
     ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF()
 
+
+################################################################################
+## Quieten warnings that a due to optional code paths
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -Wextra flag as it barfs on ffmoeg headers
+   STRING(REGEX REPLACE "-Wextra" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
 SET(LIB_NAME osgShadow)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(TARGET_H

src/osgTerrain/DisplacementMappingTechnique.cpp

@@ -35,13 +35,11 @@ DisplacementMappingTechnique::~DisplacementMappingTechnique()
 {
 }
 
-void DisplacementMappingTechnique::init(int dirtyMask, bool assumeMultiThreaded)
+void DisplacementMappingTechnique::init(int /*dirtyMask*/, bool /*assumeMultiThreaded*/)
 {
     if (!_terrainTile) return;
     if (!_terrainTile->getTerrain()) return;
 
-    //OSG_NOTICE<<"DisplacementMappingTechnique::init("<<dirtyMask<<", "<<assumeMultiThreaded<<")"<<std::endl;
-
     GeometryPool* geometryPool = _terrainTile->getTerrain()->getGeometryPool();
     _transform = geometryPool->getTileSubgraph(_terrainTile);
 

src/osgTerrain/GeometryPool.cpp

@@ -812,7 +812,7 @@ void GeometryPool::applyLayers(osgTerrain::TerrainTile* tile, osg::StateSet* sta
     }
 }
 
-osg::StateSet* GeometryPool::getRootStateSetForTerrain(Terrain* terrain)
+osg::StateSet* GeometryPool::getRootStateSetForTerrain(Terrain* /*terrain*/)
 {
     //OSG_NOTICE<<"getRootStateSetForTerrain("<<terrain<<")"<<std::endl;
     return _rootStateSet.get();

src/osgText/GlyphGeometry.cpp

@@ -486,7 +486,7 @@ public:
         }
     }
 
-    void addBoundaryToGeometry(osg::Geometry* geometry, float targetThickness, const std::string& faceName, const std::string& bevelName)
+    void addBoundaryToGeometry(osg::Geometry* geometry, float /*targetThickness*/, const std::string& faceName, const std::string& bevelName)
     {
         if (_segments.empty()) return;
 

src/osgUI/Callbacks.cpp

@@ -27,7 +27,10 @@ CloseCallback::CloseCallback(const std::string& callbackName, osgUI::Widget* clo
     setName(callbackName);
 }
 
-CloseCallback::CloseCallback(const CloseCallback& hc, const osg::CopyOp& copyop)
+CloseCallback::CloseCallback(const CloseCallback& hc, const osg::CopyOp& copyop):
+    osg::Object(hc, copyop),
+    osg::Callback(hc, copyop),
+    osg::CallbackObject(hc, copyop)
 {
 }
 
@@ -70,11 +73,13 @@ HandleCallback::HandleCallback()
 }
 
 HandleCallback::HandleCallback(const HandleCallback& hc, const osg::CopyOp& copyop):
+    osg::Object(hc, copyop),
+    osg::Callback(hc, copyop),
     osg::CallbackObject(hc, copyop)
 {
 }
 
-bool HandleCallback::run(osg::Object* object, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const
+bool HandleCallback::run(osg::Object* /*object*/, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const
 {
     if (inputParameters.size()>=2)
     {
@@ -89,7 +94,7 @@ bool HandleCallback::run(osg::Object* object, osg::Parameters& inputParameters,
     return false;
 }
 
-bool HandleCallback::handle(osgGA::EventVisitor* ev, osgGA::Event* event) const
+bool HandleCallback::handle(osgGA::EventVisitor* /*ev*/, osgGA::Event* /*event*/) const
 {
     return false;
 }
@@ -101,6 +106,8 @@ DragCallback::DragCallback():
 }
 
 DragCallback::DragCallback(const DragCallback& hc, const osg::CopyOp& copyop):
+    osg::Object(hc, copyop),
+    osg::Callback(hc, copyop),
     HandleCallback(hc, copyop)
 {
 }

src/osgUI/Dialog.cpp

@@ -34,7 +34,7 @@ Dialog::Dialog(const osgUI::Dialog& dialog, const osg::CopyOp& copyop):
 {
 }
 
-bool Dialog::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
+bool Dialog::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* event)
 {
     osgGA::GUIEventAdapter* ea = event->asGUIEventAdapter();
     if (!ea) return false;

src/osgUI/LineEdit.cpp

@@ -31,7 +31,7 @@ LineEdit::LineEdit(const osgUI::LineEdit& label, const osg::CopyOp& copyop):
 {
 }
 
-bool LineEdit::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
+bool LineEdit::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* event)
 {
     if (!getHasEventFocus()) return false;
 

src/osgUI/Popup.cpp

@@ -30,7 +30,7 @@ Popup::Popup(const osgUI::Popup& dialog, const osg::CopyOp& copyop):
 {
 }
 
-bool Popup::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
+bool Popup::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* event)
 {
 //    OSG_NOTICE<<"Popup::handleImplementation"<<std::endl;
 

src/osgUI/PushButton.cpp

@@ -30,7 +30,7 @@ PushButton::PushButton(const osgUI::PushButton& pb, const osg::CopyOp& copyop):
 {
 }
 
-bool PushButton::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
+bool PushButton::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* event)
 {
     if (!getHasEventFocus()) return false;
 

src/osgUI/Validator.cpp

@@ -121,7 +121,7 @@ IntValidator::IntValidator(const IntValidator& validator, const osg::CopyOp& cop
 {
 }
 
-IntValidator::State IntValidator::validateImplementation(std::string& str, int& cursorpos) const
+IntValidator::State IntValidator::validateImplementation(std::string& str, int& /*cursorpos*/) const
 {
     std::string newstring;
     bool canBeNegative = _bottom<0.0;
@@ -205,7 +205,7 @@ DoubleValidator::DoubleValidator(const DoubleValidator& validator, const osg::Co
 {
 }
 
-DoubleValidator::State DoubleValidator::validateImplementation(std::string& str, int& cursorpos) const
+DoubleValidator::State DoubleValidator::validateImplementation(std::string& str, int& /*cursorpos*/) const
 {
     std::string newstring;
     bool canBeNegative = _bottom<0.0;

src/osgUI/Widget.cpp

@@ -299,7 +299,7 @@ bool Widget::handle(osgGA::EventVisitor* ev, osgGA::Event* event)
     return handleImplementation(ev, event);
 }
 
-bool Widget::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
+bool Widget::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* /*event*/)
 {
     return false;
 }

src/osgUtil/CullVisitor.cpp

@@ -58,6 +58,7 @@ CullVisitor::CullVisitor():
 }
 
 CullVisitor::CullVisitor(const CullVisitor& rhs):
+    osg::Object(rhs),
     NodeVisitor(rhs),
     CullStack(rhs),
     _currentStateGraph(NULL),

src/osgUtil/LineSegmentIntersector.cpp

@@ -225,7 +225,7 @@ LineSegmentIntersector::LineSegmentIntersector(const osg::Vec3d& start, const os
 LineSegmentIntersector::LineSegmentIntersector(CoordinateFrame cf, const osg::Vec3d& start, const osg::Vec3d& end,
                                                LineSegmentIntersector* parent, osgUtil::Intersector::IntersectionLimit intersectionLimit):
     Intersector(cf, intersectionLimit),
-    _parent(0),
+    _parent(parent),
     _start(start),
     _end(end)
 {

src/osgViewer/CMakeLists.txt

@@ -7,8 +7,18 @@ ENDIF()
 
 SET(LIB_NAME osgViewer)
 
+
+################################################################################
+## Quieten warnings that a due to optional code paths
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -Wextra flag as it barfs on ffmoeg headers
+   STRING(REGEX REPLACE "-Wextra" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 
+
 FILE(GLOB CONFIG_HEADER_FILES ${HEADER_PATH}/config/*)
 FILE(GLOB CONFIG_SOURCE_FILES config/*.cpp)
 

src/osgVolume/MultipassTechnique.cpp

@@ -161,7 +161,7 @@ class RTTCameraCullCallback : public osg::NodeCallback
             _tileData(tileData),
             _mt(mt) {}
 
-        virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+        virtual void operator()(osg::Node* /*node*/, osg::NodeVisitor* nv)
         {
             osgUtil::CullVisitor* cv = nv->asCullVisitor();
 
@@ -935,7 +935,7 @@ class RTTBackfaceCameraCullCallback : public osg::NodeCallback
             _tileData(tileData),
             _mt(mt) {}
 
-        virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+        virtual void operator()(osg::Node* /*node*/, osg::NodeVisitor* nv)
         {
             osgUtil::CullVisitor* cv = nv->asCullVisitor();
 
@@ -963,10 +963,10 @@ class ShadingModelVisitor : public osgVolume::PropertyVisitor
             _shadingModel(VolumeSettings::Standard),
             _usesTransferFunction(false) {}
 
-        virtual void apply(IsoSurfaceProperty& iso) { _shadingModel = VolumeSettings::Isosurface; }
-        virtual void apply(MaximumIntensityProjectionProperty& mip) { _shadingModel = VolumeSettings::MaximumIntensityProjection; }
-        virtual void apply(LightingProperty& lp) { _shadingModel = VolumeSettings::Light; }
-        virtual void apply(TransferFunctionProperty& tf) { _usesTransferFunction = true; }
+        virtual void apply(IsoSurfaceProperty& /*iso*/) { _shadingModel = VolumeSettings::Isosurface; }
+        virtual void apply(MaximumIntensityProjectionProperty& /*mip*/) { _shadingModel = VolumeSettings::MaximumIntensityProjection; }
+        virtual void apply(LightingProperty& /*lp*/) { _shadingModel = VolumeSettings::Light; }
+        virtual void apply(TransferFunctionProperty& /*tf*/) { _usesTransferFunction = true; }
         virtual void apply(VolumeSettings& vs) { _shadingModel = vs.getShadingModel(); }
 
         VolumeSettings::ShadingModel    _shadingModel;

src/osgVolume/VolumeScene.cpp

@@ -67,7 +67,7 @@ void VolumeScene::ViewData::clearTiles()
     }
 }
 
-void VolumeScene::ViewData::visitTile(VolumeTile* tile)
+void VolumeScene::ViewData::visitTile(VolumeTile* /*tile*/)
 {
 }
 

src/osgWidget/CMakeLists.txt

@@ -4,6 +4,14 @@ ELSE()
     ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF()
 
+################################################################################
+## Quieten warnings that a due to optional code paths
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -Wextra flag as it barfs on ffmoeg headers
+   STRING(REGEX REPLACE "-Wextra" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
 SET(LIB_NAME osgWidget)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(TARGET_H

src/osgWidget/Input.cpp

@@ -82,7 +82,8 @@ Input::Input(const std::string& name, const std::string& label, unsigned int siz
    _cursor->setDrawCallback( new BlinkCursorCallback(_insertMode) );
 }
 
-void Input::_calculateSize(const XYCoord& size) {
+void Input::_calculateSize(const XYCoord& /*size*/)
+    {
    // An Input cannot currently set it's own size RELIABLY until the osgText implementation
    // is dratiscally improved. I'm getting wildly crazy results. :(
    // point_type height = size.y() > _cursor->getHeight() ? size.y() : _cursor->getHeight();
@@ -281,11 +282,12 @@ void Input::positioned()
     }
 }
 
-bool Input::keyUp(int key, int mask, const WindowManager*) {
+bool Input::keyUp(int /*key*/, int /*mask*/, const WindowManager*)
+{
    return false;
 }
 
-bool Input::mouseDrag (double x, double y, const WindowManager*)
+bool Input::mouseDrag (double x, double /*y*/, const WindowManager*)
 {
     _mouseClickX += x;
     x = _mouseClickX;
@@ -306,7 +308,7 @@ bool Input::mouseDrag (double x, double y, const WindowManager*)
     return true;
 }
 
-bool Input::mousePush (double x, double y, const WindowManager* wm)
+bool Input::mousePush (double x, double /*y*/, const WindowManager* /*wm*/)
 {
     double offset = getOrigin().x();
     Window* window = getParent();

src/osgWidget/Lua.cpp

@@ -131,7 +131,7 @@ bool LuaEngine::close() {
 #endif
 }
 
-bool LuaEngine::eval(const std::string& code) {
+bool LuaEngine::eval(const std::string& /*code*/) {
 #ifdef OSGWIDGET_USELUA
     if(luaL_dostring(_data->lua, code.c_str())) {
         warn() << "LuaEngine::eval - " << lua_tostring(_data->lua, -1) << std::endl;
@@ -146,7 +146,7 @@ bool LuaEngine::eval(const std::string& code) {
 #endif
 }
 
-bool LuaEngine::runFile(const std::string& filePath) {
+bool LuaEngine::runFile(const std::string& /*filePath*/) {
 #ifdef OSGWIDGET_USELUA
     if(!osgDB::fileExists(filePath)) {
         warn() << "Couldn't find file \"" << filePath << "\" for LuaEngine." << std::endl;

src/osgWrappers/deprecated-dotosg/osgAnimation/ReaderWriter.cpp

@@ -126,11 +126,11 @@ RegisterDotOsgWrapperProxy g_BoneProxy
 
 
 
-bool Skeleton_readLocalData(Object& obj, Input& fr)
+bool Skeleton_readLocalData(Object& /*obj*/, Input& /*fr*/)
 {
     return false;
 }
-bool Skeleton_writeLocalData(const Object& obj, Output& fr)
+bool Skeleton_writeLocalData(const Object& /*obj*/, Output& /*fr*/)
 {
     return true;
 }
@@ -1009,13 +1009,13 @@ RegisterDotOsgWrapperProxy g_osgAnimationMorphGeometryProxy
 
 
 
-bool UpdateBone_readLocalData(Object& obj, Input& fr)
+bool UpdateBone_readLocalData(Object& /*obj*/, Input& /*fr*/)
 {
     bool iteratorAdvanced = false;
     return iteratorAdvanced;
 }
 
-bool UpdateBone_writeLocalData(const Object& obj, Output& fw)
+bool UpdateBone_writeLocalData(const Object& /*obj*/, Output& /*fw*/)
 {
     return true;
 }
@@ -1032,13 +1032,13 @@ RegisterDotOsgWrapperProxy g_UpdateBoneProxy
 
 
 
-bool UpdateSkeleton_readLocalData(Object& obj, Input& fr)
+bool UpdateSkeleton_readLocalData(Object& /*obj*/, Input& /*fr*/)
 {
     bool iteratorAdvanced = false;
     return iteratorAdvanced;
 }
 
-bool UpdateSkeleton_writeLocalData(const Object& obj, Output& fw)
+bool UpdateSkeleton_writeLocalData(const Object& /*obj*/, Output& /*fw*/)
 {
     return true;
 }
@@ -1054,13 +1054,13 @@ RegisterDotOsgWrapperProxy g_UpdateSkeletonProxy
     );
 
 
-bool UpdateMorph_readLocalData(Object& obj, Input& fr)
+bool UpdateMorph_readLocalData(Object& /*obj*/, Input& /*fr*/)
 {
     bool iteratorAdvanced = false;
     return iteratorAdvanced;
 }
 
-bool UpdateMorph_writeLocalData(const Object& obj, Output& fw)
+bool UpdateMorph_writeLocalData(const Object& /*obj*/, Output& /*fw*/)
 {
     return true;
 }

src/osgWrappers/deprecated-dotosg/osgAnimation/UpdateMaterial.cpp

@@ -25,13 +25,13 @@ using namespace osg;
 using namespace osgDB;
 
 
-bool UpdateMaterial_readLocalData(Object& obj, Input& fr)
+bool UpdateMaterial_readLocalData(Object& /*obj*/, Input& /*fr*/)
 {
     bool iteratorAdvanced = false;
     return iteratorAdvanced;
 }
 
-bool UpdateMaterial_writeLocalData(const Object& obj, Output& fw)
+bool UpdateMaterial_writeLocalData(const Object& /*obj*/, Output& /*fw*/)
 {
     return true;
 }

src/osgWrappers/deprecated-dotosg/osgTerrain/GeometryTechnique.cpp

@@ -26,14 +26,14 @@ REGISTER_DOTOSGWRAPPER(GeometryTechnique_Proxy)
 );
 
 
-bool GeometryTechnique_readLocalData(osg::Object& obj, osgDB::Input &fr)
+bool GeometryTechnique_readLocalData(osg::Object& /*obj*/, osgDB::Input& /*fr*/)
 {
     //osgTerrain::GeometryTechnique& gt = static_cast<osgTerrain::GeometryTechnique&>(obj);
     bool itrAdvanced = false;
     return itrAdvanced;
 }
 
-bool GeometryTechnique_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
+bool GeometryTechnique_writeLocalData(const osg::Object& /*obj*/, osgDB::Output& /*fw*/)
 {
     //const osgTerrain::GeometryTechnique& gt = static_cast<const osgTerrain::GeometryTechnique&>(obj);
     return true;

src/osgWrappers/deprecated-dotosg/osgVolume/FixedFunctionTechnique.cpp

@@ -26,14 +26,14 @@ REGISTER_DOTOSGWRAPPER(FixedFunctionTechnique_Proxy)
 );
 
 
-bool FixedFunctionTechnique_readLocalData(osg::Object& obj, osgDB::Input &fr)
+bool FixedFunctionTechnique_readLocalData(osg::Object& /*obj*/, osgDB::Input& /*fr*/)
 {
     //osgVolume::FixedFunctionTechnique& fft = static_cast<osgVolume::FixedFunctionTechnique&>(obj);
     bool itrAdvanced = false;
     return itrAdvanced;
 }
 
-bool FixedFunctionTechnique_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
+bool FixedFunctionTechnique_writeLocalData(const osg::Object& /*obj*/, osgDB::Output& /*fw*/)
 {
     //const osgVolume::FixedFunctionTechnique& fft = static_cast<const osgVolume::FixedFunctionTechnique&>(obj);
     return true;

src/osgWrappers/deprecated-dotosg/osgVolume/Property.cpp

@@ -43,12 +43,12 @@ REGISTER_DOTOSGWRAPPER(LightingProperty_Proxy)
     Property_writeLocalData
 );
 
-bool Property_readLocalData(osg::Object& obj, osgDB::Input &fr)
+bool Property_readLocalData(osg::Object& /*obj*/, osgDB::Input& /*fr*/)
 {
     return false;
 }
 
-bool Property_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
+bool Property_writeLocalData(const osg::Object& /*obj*/, osgDB::Output& /*fw*/)
 {
     return true;
 }

src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp

@@ -26,12 +26,12 @@ REGISTER_DOTOSGWRAPPER(PropertyAdjustmentCallback_Proxy)
 );
 
 
-bool PropertyAdjustmentCallback_readLocalData(osg::Object& obj, osgDB::Input &fr)
+bool PropertyAdjustmentCallback_readLocalData(osg::Object& /*obj*/, osgDB::Input& /*fr*/)
 {
     return false;
 }
 
-bool PropertyAdjustmentCallback_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
+bool PropertyAdjustmentCallback_writeLocalData(const osg::Object& /*obj*/, osgDB::Output& /*fw*/)
 {
     return true;
 }

src/osgWrappers/deprecated-dotosg/osgVolume/RayTracedTechnique.cpp

@@ -26,14 +26,14 @@ REGISTER_DOTOSGWRAPPER(RayTracedTechnique_Proxy)
 );
 
 
-bool RayTracedTechnique_readLocalData(osg::Object& obj, osgDB::Input &fr)
+bool RayTracedTechnique_readLocalData(osg::Object& /*obj*/, osgDB::Input& /*fr*/)
 {
     //osgVolume::RayTracedTechnique& st = static_cast<osgVolume::RayTracedTechnique&>(obj);
     bool itrAdvanced = false;
     return itrAdvanced;
 }
 
-bool RayTracedTechnique_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
+bool RayTracedTechnique_writeLocalData(const osg::Object& /*obj*/, osgDB::Output& /*fw*/)
 {
     //const osgVolume::RayTracedTechnique& st = static_cast<const osgVolume::RayTracedTechnique&>(obj);
     return true;

src/osgWrappers/deprecated-dotosg/osgWidget/Box.cpp

@@ -7,7 +7,7 @@
 #include <osgDB/FileUtils>
 #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);

src/osgWrappers/deprecated-dotosg/osgWidget/EmbeddedWindow.cpp

@@ -7,7 +7,7 @@
 #include <osgDB/FileUtils>
 #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;
 

src/osgWrappers/deprecated-dotosg/osgWidget/Frame.cpp

@@ -7,7 +7,7 @@
 #include <osgDB/FileUtils>
 #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;