X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkInvertVFFilter.h;h=8ad84a2e969c6ba75ed7da41dbe50676b4ab6a0b;hb=ed673c4df16c5541a1bd46413b4a67376b28008d;hp=51dba8904285088bcd0dcba33e621ea66ad1c641;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git diff --git a/itk/clitkInvertVFFilter.h b/itk/clitkInvertVFFilter.h index 51dba89..8ad84a2 100644 --- a/itk/clitkInvertVFFilter.h +++ b/itk/clitkInvertVFFilter.h @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.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 @@ -14,7 +14,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ +===========================================================================**/ #ifndef __clitkInvertVFFilter_h #define __clitkInvertVFFilter_h #include "clitkImageCommon.h" @@ -65,22 +65,38 @@ namespace clitk //Set Methods(inline) itkSetMacro( Verbose, bool); itkSetMacro( EdgePaddingValue, PixelType ); - void SetNumberOfThreads(unsigned int r ) +#if ITK_VERSION_MAJOR <= 4 + void SetNumberOfThreads(unsigned int r ) ITK_OVERRIDE +#else + void SetNumberOfWorkUnits(unsigned int r ) ITK_OVERRIDE +#endif { m_NumberOfThreadsIsGiven=true; +#if ITK_VERSION_MAJOR <= 4 m_NumberOfThreads=r; +#else + m_NumberOfWorkUnits=r; +#endif } itkSetMacro(ThreadSafe, bool); + itkSetMacro(OutputSpacing, SpacingType); + itkSetMacro(OutputSize, SizeType); protected: InvertVFFilter(); ~InvertVFFilter() {}; - void GenerateData( ); - + void GenerateData( ) ITK_OVERRIDE; + bool m_Verbose; bool m_NumberOfThreadsIsGiven; + SpacingType m_OutputSpacing; + SizeType m_OutputSize; +#if ITK_VERSION_MAJOR <= 4 unsigned int m_NumberOfThreads; +#else + unsigned int m_NumberOfWorkUnits; +#endif PixelType m_EdgePaddingValue; bool m_ThreadSafe; };