Ensure compatibility with ITK < 4.12 for throw exception

diff --git a/itk/RelativePositionPropImageFilter.h b/itk/RelativePositionPropImageFilter.h
index 4b30db1a4fcc739f1796047fd12bd9fc0b3f13a7..e876f9fd6e042ba29a134f1f9cb709fdbe09f891 100644 (file)
--- a/itk/RelativePositionPropImageFilter.h
+++ b/itk/RelativePositionPropImageFilter.h
@@ -169,8 +169,11 @@ namespace itk
       }
     }
   
-
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
     virtual void GenerateInputRequestedRegion() ITK_OVERRIDE;
+#else
+   virtual void GenerateInputRequestedRegion() throw(InvalidRequestedRegionError) ITK_OVERRIDE;
+#endif
     void EnlargeOutputRequestedRegion (DataObject * output) ITK_OVERRIDE;
 
   protected:

diff --git a/itk/RelativePositionPropImageFilter.txx b/itk/RelativePositionPropImageFilter.txx
index 3ee1d0f24c38b15a6589a1611eadba46ddcefc61..c34c7c3f2241a1492fb014d71af8b00413b33144 100644 (file)
--- a/itk/RelativePositionPropImageFilter.txx
+++ b/itk/RelativePositionPropImageFilter.txx
@@ -50,7 +50,11 @@ namespace itk
   template <class TInputImage, class TOutputImage,class TtNorm>
   void 
   RelativePositionPropImageFilter<TInputImage,TOutputImage,TtNorm>
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
   ::GenerateInputRequestedRegion()
+#else
+  ::GenerateInputRequestedRegion() throw (InvalidRequestedRegionError)
+#endif
   {
     // call the superclass' implementation of this method
     Superclass::GenerateInputRequestedRegion ();

diff --git a/itk/clitkBackProjectImageFilter.h b/itk/clitkBackProjectImageFilter.h
index cb68779deaa22d68786fdadb0e6391d35e40ba96..9ffaffbeb3521ee85a092a0cb56ef2e6495b016f 100644 (file)
--- a/itk/clitkBackProjectImageFilter.h
+++ b/itk/clitkBackProjectImageFilter.h
@@ -210,7 +210,11 @@ namespace clitk
     void SetOutputParametersFromImage( const OutputImageConstPointer  image );
 
 
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
     void Initialize(void);
+#else
+    void Initialize(void) throw (itk::ExceptionObject);
+#endif
 
   protected:
 

diff --git a/itk/clitkBackProjectImageFilter.txx b/itk/clitkBackProjectImageFilter.txx
index e6432266300f4e6f9017f557a94bda5accfd7b70..fa8d2613fec8815c80ae08abc3046a4000f65c81 100644 (file)
--- a/itk/clitkBackProjectImageFilter.txx
+++ b/itk/clitkBackProjectImageFilter.txx
@@ -190,7 +190,11 @@ namespace clitk
   template <class InputImageType, class OutputImageType>
   void 
   BackProjectImageFilter<InputImageType, OutputImageType>
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
   ::Initialize( void )
+#else
+  ::Initialize( void ) throw (itk::ExceptionObject)
+#endif
   {
     //Change the origin of the 2D input
     typename  InputImageType::ConstPointer inputPtr=this->GetInput();

diff --git a/registration/clitkCorrelationRatioImageToImageMetric.h b/registration/clitkCorrelationRatioImageToImageMetric.h
index 51e15ae6023c238e9a24377759fc6f051136aed7..a4bc342ae230450900ffe0c4fb16a85cbfe8e346 100644 (file)
--- a/registration/clitkCorrelationRatioImageToImageMetric.h
+++ b/registration/clitkCorrelationRatioImageToImageMetric.h
@@ -105,7 +105,11 @@ public:
     *  (1) making sure that all the components are present and plugged
     *      together correctly,
     *  (3) allocate memory for bin data structures. */
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
   virtual void Initialize(void) ITK_OVERRIDE;
+#else
+  virtual void Initialize(void) throw ( ExceptionObject ) ITK_OVERRIDE;
+#endif
 
   /** Get the derivatives of the match measure. */
   void GetDerivative( const TransformParametersType & parameters,

diff --git a/registration/clitkCorrelationRatioImageToImageMetric.txx b/registration/clitkCorrelationRatioImageToImageMetric.txx
index 685a0435e6b619154bb5de6b3e69864f579e5777..1454539c8183b24d2d56a8239d027061076732d9 100644 (file)
--- a/registration/clitkCorrelationRatioImageToImageMetric.txx
+++ b/registration/clitkCorrelationRatioImageToImageMetric.txx
@@ -51,7 +51,11 @@ CorrelationRatioImageToImageMetric<TFixedImage,TMovingImage>
 template <class TFixedImage, class TMovingImage>
 void
 CorrelationRatioImageToImageMetric<TFixedImage,TMovingImage>
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
 ::Initialize(void)
+#else
+::Initialize(void) throw ( ExceptionObject )
+#endif
 {
 
   this->Superclass::Initialize();

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetric.h b/registration/clitkOptNormalizedCorrelationImageToImageMetric.h
index 12a90ec00709592ec130e76cff7e91c5da5f83fb..067cd8757132d7e6fd6c1ca8b421a849d7d8c65f 100644 (file)
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetric.h
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetric.h
@@ -95,7 +95,11 @@ public:
    *  (2) uniformly select NumberOfSpatialSamples within
    *      the FixedImageRegion, and
    *  (3) allocate memory for pdf data structures. */
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
   virtual void Initialize(void) ITK_OVERRIDE;
+#else
+  virtual void Initialize(void) throw ( itk::ExceptionObject ) ITK_OVERRIDE;
+#endif
 
   /**  Get the value. */
   MeasureType GetValue( const ParametersType & parameters ) const ITK_OVERRIDE;

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx
index b5d28ccbac36e52b5c5ddd3a0d231320ba375abe..ea2c52a56222a9db07d45d1026f4e4a728d0b2a6 100644 (file)
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx
@@ -117,7 +117,11 @@ NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
 template <class TFixedImage, class TMovingImage>
 void
 NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
 ::Initialize(void)
+#else
+::Initialize(void) throw ( itk::ExceptionObject )
+#endif
 {
 
   this->Superclass::Initialize();

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h
index 6718316ea9543122261457cb08524136069af3d7..208cb38023df53f097934773c3f5cd0d6bb2926a 100644 (file)
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h
@@ -95,7 +95,11 @@ public:
    *  (2) uniformly select NumberOfSpatialSamples within
    *      the FixedImageRegion, and
    *  (3) allocate memory for pdf data structures. */
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
   virtual void Initialize(void) ITK_OVERRIDE;
+#else
+  virtual void Initialize(void) throw ( itk::ExceptionObject ) ITK_OVERRIDE;
+#endif
 
   /**  Get the value. */
   MeasureType GetValue( const ParametersType & parameters ) const ITK_OVERRIDE;

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
index 0389fc5209965bfa9826133dfd9eb28ad0dddadc..042b4b79863927cbd9d0e4b0e57579a2f7846ec7 100644 (file)
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
@@ -117,7 +117,11 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template <class TFixedImage, class TMovingImage>
 void
 NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
 ::Initialize(void)
+#else
+::Initialize(void) throw ( itk::ExceptionObject )
+#endif
 {
 
   this->Superclass::Initialize();

diff --git a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
index 9973cc63428fb5dca960e90162335916daa2e0d8..c51414ed6d8b6a9e51232a80a0fcc5955acafa7e 100644 (file)
--- a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
@@ -187,7 +187,11 @@ public:
    *  (2) uniformly select NumberOfSpatialSamples within
    *      the FixedImageRegion, and
    *  (3) allocate memory for pdf data structures. */
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
   virtual void Initialize(void) ITK_OVERRIDE;
+#else
+  virtual void Initialize(void) throw ( ExceptionObject ) ITK_OVERRIDE;
+#endif
 
   /**  Get the value. */
   MeasureType GetValue( const ParametersType & parameters ) const ITK_OVERRIDE;

diff --git a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
index 592fe22687ae4378f504ae1930c30f47d0765fa8..ef4257e6c66f0525a8c15806923a0aaead195ae2 100644 (file)
--- a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
@@ -183,7 +183,11 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template <class TFixedImage, class TMovingImage>
 void
 MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
 ::Initialize(void)
+#else
+::Initialize(void) throw ( ExceptionObject )
+#endif
 {
   this->Superclass::Initialize();
   this->Superclass::MultiThreadingInitialize();

diff --git a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h
index ffa6ac959daad7e29b073bd3ec02fae5ff93bd3f..e12b42fb52684d325493940bbfd08f644f0e49ae 100644 (file)
--- a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h
@@ -98,7 +98,11 @@ public:
    *  (2) uniformly select NumberOfSpatialSamples within
    *      the FixedImageRegion, and
    *  (3) allocate memory for pdf data structures. */
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
   virtual void Initialize(void) ITK_OVERRIDE;
+#else
+  virtual void Initialize(void) throw ( ExceptionObject ) ITK_OVERRIDE;
+#endif
 
   /**  Get the value. */
   MeasureType GetValue( const ParametersType & parameters ) const ITK_OVERRIDE;

diff --git a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx
index af1c98645af36d2b0483d6fc5226eafad1e49a67..02427a397d50e586ef70dc381ffff5541c6114fb 100644 (file)
--- a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx
@@ -100,7 +100,11 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template <class TFixedImage, class TMovingImage>
 void
 MeanSquaresImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
 ::Initialize(void)
+#else
+::Initialize(void) throw ( ExceptionObject )
+#endif
 {
 
   this->Superclass::Initialize();