From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Mon, 23 May 2016 06:18:48 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~16^2~4
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c234e07e4ef90bb8b08c75ca4f1b3a76055e7859;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
---

c234e07e4ef90bb8b08c75ca4f1b3a76055e7859
diff --cc itk/clitkInvertVFFilter.txx
index e26fed7,525b486..c32782f
--- a/itk/clitkInvertVFFilter.txx
+++ b/itk/clitkInvertVFFilter.txx
@@@ -329,14 -314,10 +317,10 @@@ template<class InputImageType, class Ou
  
  //=========================================================================================================================
  //update the output for the outputRegionForThread
- #if ITK_VERSION_MAJOR >= 4
  template<class InputImageType, class OutputImageType > void HelperClass2<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
- #else
- template<class InputImageType, class OutputImageType > void HelperClass2<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
- #endif
  {
  //   std::cout << "HelperClass2::ThreadedGenerateData - IN " << threadId << std::endl;
 -  
 +
    //Get pointer to the input
    typename InputImageType::ConstPointer inputPtr = this->GetInput();