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

diff --cc itk/clitkInvertVFFilter.txx
index e26fed7c77c6b7cac148e970adce1491587742bd,525b48692c38a8e78e751a81d2a8fc2d2a027698..c32782f08b84558f1bcf2cc4fa6f59976f94bd4f
--- 1/itk/clitkInvertVFFilter.txx
--- 2/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();
  

diff --cc tools/clitkImageStatisticsGenericFilter.txx
Simple merge

diff --cc vv/vvMidPosition.cxx
Simple merge