X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FRelativePositionPropImageFilter.txx;h=c34c7c3f2241a1492fb014d71af8b00413b33144;hb=5f801bf0b07486889123e941d6913d4369dfc86f;hp=c2b51491665673561d6fec535d10e1ad174b1119;hpb=38786c4da19b87319bbe3cecc145e3d1771d10da;p=clitk.git

diff --git a/itk/RelativePositionPropImageFilter.txx b/itk/RelativePositionPropImageFilter.txx
index c2b5149..c34c7c3 100644
--- a/itk/RelativePositionPropImageFilter.txx
+++ b/itk/RelativePositionPropImageFilter.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  Authors belong to:
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
+
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================*/
 /*=========================================================================
 
   Program:   Insight Segmentation & Registration Toolkit
@@ -33,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 ();
@@ -69,8 +90,6 @@ namespace itk
   ::GenerateData()
   {
 
-    // std::cout <<"GenerateData" << std::endl;
-
     this->AllocateOutputs();
     computeDirection();
     typename InputImageType::ConstPointer input = this->GetInput();
@@ -114,7 +133,6 @@ namespace itk
   
     if(!m_Fast)
       {  
-        DD(m_Fast);
         for(int i=0;i<pow((double)2,(int)ImageDimension);i++)
           {
             int orient[ImageDimension];