From: Vivien Delmon Date: Mon, 28 Oct 2013 12:23:45 +0000 (+0100) Subject: Remove useless include and trailing whitespaces X-Git-Tag: v1.4.0~155^2~4 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=528085fbf722073396c645e8ad08d3ba6631f7c0;p=clitk.git Remove useless include and trailing whitespaces --- diff --git a/segmentation/clitkMorphoMathFilter.h b/segmentation/clitkMorphoMathFilter.h index f86c2ba..a634006 100644 --- a/segmentation/clitkMorphoMathFilter.h +++ b/segmentation/clitkMorphoMathFilter.h @@ -1,7 +1,7 @@ /*========================================================================= Program: vv http://www.creatis.insa-lyon.fr/rio/vv - Authors belong to: + 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 @@ -22,7 +22,6 @@ // clitk include #include "clitkIO.h" #include "clitkImageCommon.h" -#include "clitkMorphoMath_ggo.h" #include "clitkConditionalBinaryErodeImageFilter.h" #include "clitkConditionalBinaryDilateImageFilter.h" @@ -39,12 +38,12 @@ namespace clitk { //-------------------------------------------------------------------- template - class ITK_EXPORT MorphoMathFilter: - public clitk::FilterBase, - public itk::ImageToImageFilter + class ITK_EXPORT MorphoMathFilter: + public clitk::FilterBase, + public itk::ImageToImageFilter { - - public: + + public: /** Standard class typedefs. */ typedef itk::ImageToImageFilter Superclass; typedef MorphoMathFilter Self; @@ -52,8 +51,8 @@ namespace clitk { typedef itk::SmartPointer ConstPointer; /** Method for creation through the object factory. */ - itkNewMacro(Self); - + itkNewMacro(Self); + /** Run-time type information (and related methods). */ itkTypeMacro(AddRelativePositionConstraintToLabelImageFilter, ImageToImageFilter); FILTERBASE_INIT; @@ -61,7 +60,7 @@ namespace clitk { /** Some convenient typedefs. */ typedef typename ImageType::ConstPointer ImageConstPointer; typedef typename ImageType::Pointer ImagePointer; - typedef typename ImageType::RegionType RegionType; + typedef typename ImageType::RegionType RegionType; typedef typename ImageType::PixelType PixelType; typedef typename ImageType::SpacingType SpacingType; typedef typename ImageType::SizeType SizeType; @@ -69,17 +68,17 @@ namespace clitk { typedef typename ImageType::PointType PointType; typedef float InternalPixelType; typedef itk::Image InternalImageType; - + /** ImageDimension constants */ itkStaticConstMacro(ImageDimension, unsigned int, ImageType::ImageDimension); typedef itk::Image FloatImageType; /** Operation types */ typedef enum { Erode = 0, Dilate = 1, - Close = 2, Open = 3, + Close = 2, Open = 3, CondErode = 4, CondDilate = 5 } OperationTypeEnumeration; - + /** Options */ itkGetConstMacro(VerboseFlag, bool); itkSetMacro(VerboseFlag, bool); @@ -92,7 +91,7 @@ namespace clitk { itkSetMacro(ForegroundValue, PixelType); void SetOperationType(int type); - + itkGetConstMacro(RadiusInMM, PointType); void SetRadiusInMM(PointType & p); @@ -103,11 +102,11 @@ namespace clitk { itkGetConstMacro(BoundaryToForegroundFlag, bool); itkSetMacro(BoundaryToForegroundFlag, bool); itkBooleanMacro(BoundaryToForegroundFlag); - + itkGetConstMacro(ExtendSupportFlag, bool); itkSetMacro(ExtendSupportFlag, bool); itkBooleanMacro(ExtendSupportFlag); - + protected: MorphoMathFilter(); virtual ~MorphoMathFilter(); @@ -132,10 +131,10 @@ namespace clitk { MorphoMathFilter(const Self&); //purposely not implemented void operator=(const Self&); //purposely not implemented }; - + } // end namespace clitk #ifndef ITK_MANUAL_INSTANTIATION #include "clitkMorphoMathFilter.txx" #endif - + #endif //#define CLITKMORPHOMATHFILTER_H