...

diff --git a/lib/cpExtensions/Algorithms/BezierCurveFunction.h b/lib/cpExtensions/Algorithms/BezierCurveFunction.h
index 2deba450a5c79af6f66a5d238df83b2ab89a50da..6bc0582475acd4033e6a6d7e51648511c974e4e4 100644 (file)
--- a/lib/cpExtensions/Algorithms/BezierCurveFunction.h
+++ b/lib/cpExtensions/Algorithms/BezierCurveFunction.h
@@ -42,7 +42,7 @@ namespace cpExtensions
       virtual void AddPoint( const TVector& v );
       virtual unsigned int GetNumberOfPoints( ) const;
 
-      virtual TVector Evaluate( const TScalar& u ) const;
+      virtual TVector Evaluate( const TScalar& u ) const ITK_OVERRIDE;
       virtual TFrame EvaluateFrenetFrame( const TScalar& u ) const;
       virtual TScalar EvaluateLength( ) const;
 

diff --git a/lib/cpExtensions/Algorithms/IsoImageSlicer.h b/lib/cpExtensions/Algorithms/IsoImageSlicer.h
index 19410c3574863035c11b5270e18412276be74fda..d3dec0805d5db26763c370ffd50696f12a66969e 100644 (file)
--- a/lib/cpExtensions/Algorithms/IsoImageSlicer.h
+++ b/lib/cpExtensions/Algorithms/IsoImageSlicer.h
@@ -86,7 +86,7 @@ namespace cpExtensions
       itkSetMacro( SpacingFromMinimum, bool );
 
     public:
-      virtual unsigned long GetMTime( ) const;
+      virtual unsigned long GetMTime( ) const ITK_OVERRIDE;
 
       const TInterpolateFunction* GetInterpolator( ) const;
       const TMatrix& GetRotation( ) const;
@@ -105,9 +105,9 @@ namespace cpExtensions
       BaseImageSlicer( );
       virtual ~BaseImageSlicer( );
 
-      virtual void GenerateOutputInformation( ); // TODO { }
-      virtual void GenerateInputRequestedRegion( );
-      virtual void GenerateData( );
+      virtual void GenerateOutputInformation( ) ITK_OVERRIDE; // TODO { }
+      virtual void GenerateInputRequestedRegion( ) ITK_OVERRIDE;
+      virtual void GenerateData( ) ITK_OVERRIDE;
 
     private:
       // Purposely not implemented

diff --git a/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h b/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h
index c0612a28eec649ea9c01afcc126d29d735d51a97..272e83937293dc1d024ab84e0fdf8b2fead4ba95 100644 (file)
--- a/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h
+++ b/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h
@@ -58,7 +58,7 @@ namespace cpExtensions
       MultiScaleGaussianImageFilter( );
       virtual ~MultiScaleGaussianImageFilter( );
 
-      virtual void GenerateData( );
+      virtual void GenerateData( ) ITK_OVERRIDE;
 
       template< class F >
       void _GenerateData( );

diff --git a/lib/cpPlugins_ITKInstances/Base_explicit_description.txt b/lib/cpPlugins_ITKInstances/Base_explicit_description.txt
index 38010d4f9db9cc5666ad98fbcc2c98dcc9ed48dc..92aa6ab229fb606e0facec5c23ac9952ef4664ca 100644 (file)
--- a/lib/cpPlugins_ITKInstances/Base_explicit_description.txt
+++ b/lib/cpPlugins_ITKInstances/Base_explicit_description.txt
@@ -23,6 +23,7 @@ i itkTransform.h
 c itk::Array< #1 >
 c itk::FixedArray< #1 , #2 >
 c itk::FixedArray< float , 6 >
+c itk::FixedArray< double , 6 >
 c itk::Point< #5 , #2 >
 c itk::Vector< #5 , #2 >
 c itk::CovariantVector< #5 , #2 >

diff --git a/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx b/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx
index 1c9a673ba58d0c20f67df12ef804f81d6e6ba2ff..c890d8352b4fed7777b73139845ff4899681924c 100644 (file)
--- a/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx
@@ -5,6 +5,9 @@
 #include <itkHistogramThresholdImageFilter.h>
 #include <itkHistogramThresholdImageFilter.hxx>
 #include <itkBinaryFunctorImageFilter.hxx>
+#include <itkImageToHistogramFilter.hxx>
+#include <itkMaskedImageToHistogramFilter.hxx>
+#include <itkBinaryThresholdImageFilter.hxx>
 
 // -------------------------------------------------------------------------
 cpPluginsImageFilters::HistogramThresholdImageFilter::

diff --git a/plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx b/plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx
index 4b1d62cea59dc51a9d03539781fa6a9d79b169af..968e5a5facb99570070950bad47c9cf10746a97c 100644 (file)
--- a/plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx
+++ b/plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx
@@ -57,8 +57,8 @@ _GD0( _TImage* image )
     filter->SetUpperThreshold( upper_val );
     filter->SetInsideValue( in_val );
     filter->SetOutsideValue( out_val );
-    filter->Update( );
   */
+  filter->Update( );
 
   // Connect output
   this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );

diff --git a/plugins/cpPluginsImageFilters/IsoImageSlicer.cxx b/plugins/cpPluginsImageFilters/IsoImageSlicer.cxx
index 942a6e4eab93ac0d80d72bfcd3cef099b1967dfa..5869746ebb4ec3e9d4ebaceedf65b7eca76d356d 100644 (file)
--- a/plugins/cpPluginsImageFilters/IsoImageSlicer.cxx
+++ b/plugins/cpPluginsImageFilters/IsoImageSlicer.cxx
@@ -9,6 +9,11 @@
 #include <itkVariableLengthVector.hxx>
 #include <itkDiffusionTensor3D.hxx>
 #include <itkOptimizerParameters.hxx>
+#include <itkExtractImageFilter.hxx>
+#include <itkResampleImageFilter.hxx>
+#include <itkSymmetricSecondRankTensor.hxx>
+#include <itkLinearInterpolateImageFunction.hxx>
+
 /*
   #include <itkIsoImageSlicer.h>
   #include <itkIsoImageSlicer.hxx>

diff --git a/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx b/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx
index 61b2bbebba3f3155f790d440eed8ab3b652acb11..b2dd57781b6fccaaaf8b0518a4086cd83a5dbb83 100644 (file)
--- a/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx
+++ b/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx
@@ -4,6 +4,7 @@
 
 #include <itkMaskedImageToHistogramFilter.h>
 #include <itkMaskedImageToHistogramFilter.hxx>
+#include <itkImageToHistogramFilter.hxx>
 
 // -------------------------------------------------------------------------
 cpPluginsImageFilters::MaskedImageToHistogramFilter::

diff --git a/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx b/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx
index 07e5956b2bd24e91a6fd9e6f61cd618d2fc637f7..b3f2210e81959d4a130fe7754e9b766e4f88a4f3 100644 (file)
--- a/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx
@@ -21,6 +21,8 @@
 #include <itkImageRegionIterator.hxx>
 #include <itkSimpleDataObjectDecorator.hxx>
 #include <itkImageRegionConstIteratorWithIndex.hxx>
+#include <itkNthElementPixelAccessor.h>
+#include <itkImageBase.hxx>
 
 // -------------------------------------------------------------------------
 cpPluginsImageFilters::MultiScaleGaussianImageFilter::

diff --git a/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx b/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx
index e836d5950aa2bb8c338fefaa95f9e738d35a324b..b765f447a98acbd081803a9db6f6161cbcd2e57a 100644 (file)
--- a/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx
@@ -5,6 +5,10 @@
 #include <itkOtsuThresholdImageFilter.h>
 #include <itkOtsuMultipleThresholdsCalculator.hxx>
 #include <itkOtsuThresholdCalculator.hxx>
+#include <itkHistogramThresholdImageFilter.hxx>
+#include <itkImageToHistogramFilter.hxx>
+#include <itkMaskedImageToHistogramFilter.hxx>
+#include <itkBinaryThresholdImageFilter.hxx>
 
 // -------------------------------------------------------------------------
 cpPluginsImageFilters::OtsuThresholdImageFilter::

diff --git a/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx b/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx
index fcdb2553f4914c61328a3fdd71457be7872b5727..6e3ca3443d6d5f1be9ac036c377bd726dbcb2a11 100644 (file)
--- a/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx
@@ -4,13 +4,13 @@
 
 #include <itkSignedMaurerDistanceMapImageFilter.h>
 #include <itkSignedMaurerDistanceMapImageFilter.hxx>
-/*
-  #include <itkBinaryThresholdImageFilter.hxx>
-  #include <itkImageToImageFilter.hxx>
-  #include <itkInPlaceImageFilter.hxx>
-  #include <itkUnaryFunctorImageFilter.hxx>
-  #include <itkBinaryContourImageFilter.hxx>
-*/
+
+#include <itkBinaryThresholdImageFilter.hxx>
+#include <itkImageToImageFilter.hxx>
+#include <itkInPlaceImageFilter.hxx>
+#include <itkUnaryFunctorImageFilter.hxx>
+#include <itkBinaryContourImageFilter.hxx>
+
 
 // -------------------------------------------------------------------------
 cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::

diff --git a/plugins/cpPluginsWidgets/SeedWidget.h b/plugins/cpPluginsWidgets/SeedWidget.h
index 1417f1cc38846364840fe7585e3cb2260e5218d0..2ae4976b05abdf4c9d7756d708c07f6285336d28 100644 (file)
--- a/plugins/cpPluginsWidgets/SeedWidget.h
+++ b/plugins/cpPluginsWidgets/SeedWidget.h
@@ -23,7 +23,7 @@ namespace cpPluginsWidgets
     cpPlugins_Id_Macro( SeedWidget, Widgets );
 
   public:
-    virtual itk::ModifiedTimeType GetMTime( ) const;
+    virtual itk::ModifiedTimeType GetMTime( ) const ITK_OVERRIDE;
 
   protected:
     SeedWidget( );