From: Leonardo Florez <leonardo@iMac-de-Andrea.local>
Date: Thu, 16 Feb 2017 21:12:39 +0000 (-0500)
Subject: ...
X-Git-Tag: v0.1~8^2~1
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1e17bee074cb6a3f17fa60c5d9b67f9f58723d4a;p=cpPlugins.git

...
---

diff --git a/lib/cpBaseQtApplication/Pipeline/Block.h b/lib/cpBaseQtApplication/Pipeline/Block.h
index a61e00e..eaa6bf0 100644
--- a/lib/cpBaseQtApplication/Pipeline/Block.h
+++ b/lib/cpBaseQtApplication/Pipeline/Block.h
@@ -37,9 +37,9 @@ namespace cpBaseQtApplication
         typedef itk::SmartPointer< const _TFilterObserver > ConstPointer;
         itkNewMacro( _TFilterObserver );
       public:
-        void Execute( itk::Object* c, const itk::EventObject& e )
+        void Execute( itk::Object* c, const itk::EventObject& e ) override
           { this->Execute( const_cast< const itk::Object* >( c ), e ); }
-        void Execute( const itk::Object* c, const itk::EventObject& e );
+        void Execute( const itk::Object* c, const itk::EventObject& e ) override;
       public:
         Block* ObservedBlock;
       };
diff --git a/lib/cpExtensions/QT/ImageWidget.h b/lib/cpExtensions/QT/ImageWidget.h
index 9932bda..18073d6 100644
--- a/lib/cpExtensions/QT/ImageWidget.h
+++ b/lib/cpExtensions/QT/ImageWidget.h
@@ -51,8 +51,8 @@ namespace cpExtensions
       TWLActor* GetImageActor( );
       const TWLActor* GetImageActor( ) const;
 
-      void SetColor( const std::string& name, double r, double g, double b );
-      void SetLineWidth( const std::string& name, double w );
+      void SetColor( const std::string& name, double r, double g, double b ) override;
+      void SetLineWidth( const std::string& name, double w ) override;
 
     protected:
       std::string m_ImageName;
diff --git a/lib/cpInstances/Extensions/Paths.i b/lib/cpInstances/Extensions/Paths.i
index cbf4450..1533e1a 100644
--- a/lib/cpInstances/Extensions/Paths.i
+++ b/lib/cpInstances/Extensions/Paths.i
@@ -2,7 +2,9 @@ header #define ITK_MANUAL_INSTANTIATION
 
 tinclude cpExtensions/Algorithms/BezierCurveFunction:h|hxx
 tinclude cpExtensions/DataStructures/PolyLineParametricPath:h|hxx
+tinclude itkVectorContainer:h|hxx
 
+instances itk::VectorContainer< unsigned int, itk::ContinuousIndex< #real_types#, #pdims# > >
 instances cpExtensions::Algorithms::BezierCurveFunction< itk::Vector< #real_types#, #pdims# > >
 instances cpExtensions::DataStructures::PolyLineParametricPath< #pdims# >
 
diff --git a/lib/cpInstances/Images/ITK2VTKImageFilters.i b/lib/cpInstances/Images/ITK2VTKImageFilters.i
index 4166981..a248963 100644
--- a/lib/cpInstances/Images/ITK2VTKImageFilters.i
+++ b/lib/cpInstances/Images/ITK2VTKImageFilters.i
@@ -16,6 +16,5 @@ tinclude itk#filters#:h|hxx
 instances itk::#filters#< itk::Image< #pixels#, #vdims# > >
 instances itk::#filters#< itk::Image< itk::FixedArray< #scalar_types#, #vdims# >, #vdims# > >
 instances itk::#filters#< itk::Image< itk::#vector_pixels#< #real_types#, #vdims# >, #vdims# > >
-instances itk::#filters#< itk::Image< itk::#matrices#< #real_types#, #vdims#, #vdims# >, #vdims# > >
 
 ** eof - $RCSfile$
diff --git a/lib/cpInstances/Images/ITKImagesNeighborhoodIterators.i b/lib/cpInstances/Images/ITKImagesNeighborhoodIterators.i
index 466da61..e18b3b9 100644
--- a/lib/cpInstances/Images/ITKImagesNeighborhoodIterators.i
+++ b/lib/cpInstances/Images/ITKImagesNeighborhoodIterators.i
@@ -23,6 +23,7 @@ tinclude itk#it#:h|hxx
 instances itk::NeighborhoodAllocator< #scalar_types#* >
 instances itk::NeighborhoodAllocator< #pi# >
 instances itk::Neighborhood< #scalar_types#*, #pdims#, itk::NeighborhoodAllocator< #scalar_types#* > >
+instances itk::Neighborhood< signed char*, #pdims#, itk::NeighborhoodAllocator< signed char* > >
 
 instances itk::#op#< #pi#, #pdims#, itk::NeighborhoodAllocator< #pi# > >
 instances itk::#co#< itk::Image< #pi#, #pdims# >, itk::Image< #pi#, #pdims# > >
diff --git a/lib/cpPlugins/OS/FileSystem.h b/lib/cpPlugins/OS/FileSystem.h
index 26d5ad4..4c59413 100644
--- a/lib/cpPlugins/OS/FileSystem.h
+++ b/lib/cpPlugins/OS/FileSystem.h
@@ -3,6 +3,7 @@
 
 #include <cpPlugins/Config.h>
 #include <set>
+#include <string>
 
 namespace cpPlugins
 {
diff --git a/lib/cpPlugins/Pipeline/ProcessObject.cxx b/lib/cpPlugins/Pipeline/ProcessObject.cxx
index c8edba2..bb0bbed 100644
--- a/lib/cpPlugins/Pipeline/ProcessObject.cxx
+++ b/lib/cpPlugins/Pipeline/ProcessObject.cxx
@@ -30,7 +30,7 @@ GetPrintExecution( ) const
 }
 
 // -------------------------------------------------------------------------
-bool cpPlugins::Pipeline::ProcessObject::
+void cpPlugins::Pipeline::ProcessObject::
 SetPrintExecution( bool v )
 {
   this->m_PrintExecution = v;
diff --git a/lib/cpPlugins/Pipeline/ProcessObject.h b/lib/cpPlugins/Pipeline/ProcessObject.h
index 77b4a3d..5692222 100644
--- a/lib/cpPlugins/Pipeline/ProcessObject.h
+++ b/lib/cpPlugins/Pipeline/ProcessObject.h
@@ -45,14 +45,14 @@ namespace cpPlugins
       void PrintExecutionOn( );
       void PrintExecutionOff( );
       bool GetPrintExecution( ) const;
-      bool SetPrintExecution( bool v );
+      void SetPrintExecution( bool v );
       void SetPrintExecutionStream( std::ofstream* s );
 
       Parameters* GetParameters( );
       const Parameters* GetParameters( ) const;
 
-      virtual void SetITK( itk::LightObject* o );
-      virtual void SetVTK( vtkObjectBase* o );
+      virtual void SetITK( itk::LightObject* o ) override;
+      virtual void SetVTK( vtkObjectBase* o ) override;
 
       // "Getters"
       std::set< std::string > GetInputsNames( ) const;