Merge pull request #739 from hugtalbot/fix_minor_warnings_201807

[all] FIX warnings
sofa-framework · Aug 3, 2018 · 1e25866 · 1e25866
2 parents 50e0185 + e54bc49
commit 1e25866
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 21 deletions.
diff --git a/SofaKernel/framework/sofa/helper/system/PluginManager.cpp b/SofaKernel/framework/sofa/helper/system/PluginManager.cpp
@@ -228,7 +228,7 @@ bool PluginManager::unloadPlugin(const std::string &pluginPath, std::ostream* er
     }
 }
 
-Plugin* PluginManager::getPlugin(const std::string& plugin, const std::string& suffix, bool ignoreCase)
+Plugin* PluginManager::getPlugin(const std::string& plugin, const std::string& /*suffix*/, bool /*ignoreCase*/)
 {
     std::string pluginPath = plugin;
 

diff --git a/SofaKernel/framework/sofa/helper/system/PluginManager.h b/SofaKernel/framework/sofa/helper/system/PluginManager.h
@@ -182,7 +182,7 @@ class SOFA_HELPER_API PluginManager
 
     PluginMap& getPluginMap()  { return m_pluginMap; }
 
-    Plugin* getPlugin(const std::string& plugin, const std::string& suffix = getDefaultSuffix(), bool ignoreCase = true);
+    Plugin* getPlugin(const std::string& plugin, const std::string& = getDefaultSuffix(), bool = true);
 
     std::vector<std::string>& getSearchPaths() { return m_searchPaths; }
 

diff --git a/SofaKernel/modules/SofaBaseLinearSolver/MatrixLinearSolver.h b/SofaKernel/modules/SofaBaseLinearSolver/MatrixLinearSolver.h
@@ -227,7 +227,7 @@ class MatrixLinearSolver<Matrix,Vector,NoThreadManager> : public BaseMatrixLinea
     defaulttype::BaseMatrix* getSystemBaseMatrix() override { return currentGroup->systemMatrix; }
 
     /// Get the MultiMatrix view of the linear system, or NULL if this solved does not build it
-    const core::behavior::MultiMatrixAccessor* getSystemMultiMatrixAccessor() const { return &currentGroup->matrixAccessor; }
+    const core::behavior::MultiMatrixAccessor* getSystemMultiMatrixAccessor() const override { return &currentGroup->matrixAccessor; }
 
     /// Get the linear system right-hand term vector, or NULL if this solver does not build it
     defaulttype::BaseVector* getSystemRHBaseVector() override { return currentGroup->systemRHVector; }

diff --git a/SofaKernel/modules/SofaBaseMechanics/DiagonalMass.h b/SofaKernel/modules/SofaBaseMechanics/DiagonalMass.h
@@ -336,7 +336,7 @@ class DiagonalMass : public core::behavior::Mass<DataTypes>
     }
 
     //Temporary function to warn the user when old attribute names are used
-    void parse( sofa::core::objectmodel::BaseObjectDescription* arg )
+    void parse( sofa::core::objectmodel::BaseObjectDescription* arg ) override
     {
         if (arg->getAttribute("mass"))
         {

diff --git a/SofaKernel/modules/SofaBaseMechanics/UniformMass.h b/SofaKernel/modules/SofaBaseMechanics/UniformMass.h
@@ -159,7 +159,7 @@ class UniformMass : public core::behavior::Mass<DataTypes>
 
 
     //Temporary function to warn the user when old attribute names are used
-    void parse( sofa::core::objectmodel::BaseObjectDescription* arg )
+    void parse( sofa::core::objectmodel::BaseObjectDescription* arg ) override
     {
         if (arg->getAttribute("mass"))
         {

diff --git a/SofaKernel/modules/SofaBaseVisual/BaseCamera.cpp b/SofaKernel/modules/SofaBaseVisual/BaseCamera.cpp
@@ -832,7 +832,7 @@ void BaseCamera::handleEvent(sofa::core::objectmodel::Event* event)
         updateOutputData();
 }
 
-void BaseCamera::draw(const sofa::core::visual::VisualParams* params)
+void BaseCamera::draw(const sofa::core::visual::VisualParams* /*params*/)
 {
 }
 

diff --git a/applications/plugins/MultiThreading/src/TaskScheduler.cpp b/applications/plugins/MultiThreading/src/TaskScheduler.cpp
@@ -200,7 +200,7 @@ namespace sofa
 			return  true;
 		}
 
-        std::thread* WorkerThread::create_and_attach( TaskScheduler* const & taskScheduler)
+        std::thread* WorkerThread::create_and_attach( TaskScheduler* const & /*taskScheduler*/)
         {
             _stdThread = std::thread(std::bind(&WorkerThread::run, this));
             return &_stdThread;

diff --git a/applications/plugins/MultiThreading/src/TaskScheduler.h b/applications/plugins/MultiThreading/src/TaskScheduler.h
@@ -80,7 +80,7 @@ namespace sofa
 
 			bool start(TaskScheduler* const& taskScheduler);
 
-			std::thread* create_and_attach( TaskScheduler* const& taskScheduler);
+                        std::thread* create_and_attach(TaskScheduler* const&);
 
 			// queue task if there is space (or do nothing)
 			bool pushTask(Task* pTask);

diff --git a/applications/plugins/MultiThreading/src/Tasks.h b/applications/plugins/MultiThreading/src/Tasks.h
@@ -89,8 +89,8 @@ namespace sofa
 
 		private:
 
-            Task(const Task& task) {}
-            Task& operator= (const Task& task) {return *this;}
+            Task(const Task& /*task*/) {}
+            Task& operator= (const Task& /*task*/) {return *this;}
 
 
 		protected:

diff --git a/applications/projects/SofaPhysicsAPI/SofaPhysicsSimulation.cpp b/applications/projects/SofaPhysicsAPI/SofaPhysicsSimulation.cpp
@@ -220,7 +220,6 @@ SofaPhysicsSimulation::SofaPhysicsSimulation(bool useGUI_, int GUIFramerate_)
         {
           sofa::gui::initMain();
 
-          int argc= 1;
           char* argv[]= { const_cast<char*>("a") };
 
           if (sofa::gui::GUIManager::Init(argv[0],"qt"))

diff --git a/applications/projects/getDeprecatedComponents/main.cpp b/applications/projects/getDeprecatedComponents/main.cpp
@@ -3,7 +3,7 @@
 
 using sofa::helper::lifecycle::deprecatedComponents;
 
-int main(int argc, char **argv)
+int main(int /*argc*/, char **/*argv*/)
 {
     for (const auto& component : deprecatedComponents)
     {

diff --git a/applications/sofa/gui/headlessRecorder/VideoRecorderFFMpeg.cpp b/applications/sofa/gui/headlessRecorder/VideoRecorderFFMpeg.cpp
@@ -76,8 +76,10 @@ void VideoRecorderFFmpeg::start(void)
         exit(1);
     }
     st->id = oc->nb_streams-1;
-    //enc = avcodec_alloc_context3(codec);
-    enc = st->codec;
+
+    AVCodec *pCodec = avcodec_find_decoder(st->codecpar->codec_id);
+    enc = avcodec_alloc_context3(pCodec);
+
     if (!enc) {
         msg_error("VideoRecorder") << "Could not allocate video codec context";
         exit(1);
@@ -192,8 +194,8 @@ void VideoRecorderFFmpeg::stop(void)
     // Write the file trailer, if any
     av_write_trailer(oc);
 
-    // Close the codec
-    avcodec_close(st->codec);
+    // Free the codec context
+    avcodec_free_context(&enc);
 
     //sws_freeContext(sws_context);
     if (!(oc->oformat->flags & AVFMT_NOFILE))

diff --git a/applications/sofa/gui/qt/viewer/qt/QtViewer.cpp b/applications/sofa/gui/qt/viewer/qt/QtViewer.cpp
@@ -1709,9 +1709,13 @@ void QtViewer::screenshot(const std::string& filename, int compression_level)
     screenshot = this->grabFramebuffer();
     bool res = screenshot.save(filename.c_str(), nullptr, (compression_level == -1) ? -1 : compression_level*100); // compression_level is either -1 or [0,100]
     if(res)
+    {
         msg_info("QtViewer") << "Saved " << screenshot.width() << "x" << screenshot.height() << " screen image to " << filename;
+    }
     else
+    {
         msg_error("QtViewer") << "Unknown error while saving screen image to " << filename;
+    }
 }
 
 }// namespace qt

diff --git a/modules/SofaConstraint/LinearSolverConstraintCorrection.h b/modules/SofaConstraint/LinearSolverConstraintCorrection.h
@@ -76,7 +76,7 @@ class LinearSolverConstraintCorrection : public sofa::core::behavior::Constraint
 
     virtual void addComplianceInConstraintSpace(const sofa::core::ConstraintParams *cparams, defaulttype::BaseMatrix* W) override;
 
-    virtual void getComplianceMatrix(defaulttype::BaseMatrix* ) const;
+    virtual void getComplianceMatrix(defaulttype::BaseMatrix* ) const override;
 
     virtual void computeMotionCorrection(const core::ConstraintParams* cparams, core::MultiVecDerivId dx, core::MultiVecDerivId f) override;
 

diff --git a/modules/SofaOpenglVisual/Light.cpp b/modules/SofaOpenglVisual/Light.cpp
@@ -677,7 +677,7 @@ void PositionalLight::drawLight()
 
 }
 
-void PositionalLight::drawSource(const core::visual::VisualParams* vparams)
+void PositionalLight::drawSource(const core::visual::VisualParams* /*vparams*/)
 {
     Vector3 sceneMinBBox, sceneMaxBBox;
     sofa::simulation::getSimulation()->computeBBox((sofa::simulation::Node*)this->getContext(), sceneMinBBox.ptr(), sceneMaxBBox.ptr());

diff --git a/modules/SofaOpenglVisual/Light.h b/modules/SofaOpenglVisual/Light.h
@@ -175,7 +175,7 @@ class SOFA_OPENGL_VISUAL_API PositionalLight : public Light
     virtual ~PositionalLight();
     virtual void drawLight() override;
     virtual void draw(const core::visual::VisualParams* vparams) override;
-    virtual void drawSource(const core::visual::VisualParams* vparams) override;
+    virtual void drawSource(const core::visual::VisualParams*) override;
     virtual const sofa::defaulttype::Vector3 getPosition() override { return d_position.getValue(); }
     LightType getLightType() override { return LightType::POSITIONAL; }
 };

diff --git a/modules/SofaPreconditioner/src/SofaPreconditioner/ShewchukPCGLinearSolver.cpp b/modules/SofaPreconditioner/src/SofaPreconditioner/ShewchukPCGLinearSolver.cpp
@@ -77,8 +77,14 @@ void ShewchukPCGLinearSolver<TMatrix,TVector>::init()
 
         c->get(m_preconditioners, f_preconditioners.getValue());
 
-        if (m_preconditioners) msg_info() << "Found " << f_preconditioners.getValue();
-        else msg_error() << "Solver \"" << f_preconditioners.getValue() << "\" not found.";
+        if(m_preconditioners)
+        {
+            msg_info() << "Found " << f_preconditioners.getValue();
+        }
+        else
+        {
+            msg_error() << "Solver \"" << f_preconditioners.getValue() << "\" not found.";
+        }
     }
 
     first = true;