From: dsarrut Date: Wed, 7 Jul 2010 07:01:11 +0000 (+0000) Subject: correct output bug X-Git-Tag: v1.2.0~563 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=682faa996059bfeee148e3d65ffa5cec4dadf3e2;p=clitk.git correct output bug --- diff --git a/itk/clitkAutoCropFilter.h b/itk/clitkAutoCropFilter.h index b294efb..d060a97 100644 --- a/itk/clitkAutoCropFilter.h +++ b/itk/clitkAutoCropFilter.h @@ -29,14 +29,14 @@ namespace clitk { */ //-------------------------------------------------------------------- - template + template class ITK_EXPORT AutoCropFilter: - public itk::ImageToImageFilter { + public itk::ImageToImageFilter { public: /** Standard class typedefs. */ typedef AutoCropFilter Self; - typedef itk::ImageToImageFilter Superclass; + typedef itk::ImageToImageFilter Superclass; typedef itk::SmartPointer Pointer; typedef itk::SmartPointer ConstPointer; @@ -47,7 +47,6 @@ namespace clitk { itkTypeMacro(AutoCropFilter, ImageToImageFilter); /** Some convenient typedefs. */ - typedef TImageType ImageType; typedef typename ImageType::ConstPointer ImageConstPointer; typedef typename ImageType::Pointer ImagePointer; typedef typename ImageType::PixelType ImagePixelType; @@ -61,7 +60,7 @@ namespace clitk { void SetBackgroundValue(ImagePixelType p); /** ImageDimension constants */ - itkStaticConstMacro(ImageDimension, unsigned int, TImageType::ImageDimension); + itkStaticConstMacro(ImageDimension, unsigned int, ImageType::ImageDimension); protected: AutoCropFilter(); diff --git a/itk/clitkAutoCropFilter.txx b/itk/clitkAutoCropFilter.txx index 46e3587..164bb22 100644 --- a/itk/clitkAutoCropFilter.txx +++ b/itk/clitkAutoCropFilter.txx @@ -33,9 +33,9 @@ namespace clitk { //-------------------------------------------------------------------- - template - AutoCropFilter:: - AutoCropFilter():itk::ImageToImageFilter() { + template + AutoCropFilter:: + AutoCropFilter():itk::ImageToImageFilter() { this->SetNumberOfRequiredInputs(1); m_BackgroundValue = 0; } @@ -43,20 +43,20 @@ namespace clitk { //-------------------------------------------------------------------- - template + template void - AutoCropFilter:: - SetInput(const TImageType * image) { + AutoCropFilter:: + SetInput(const ImageType * image) { // Process object is not const-correct so the const casting is required. - this->SetNthInput(0, const_cast( image )); + this->SetNthInput(0, const_cast( image )); } //-------------------------------------------------------------------- //-------------------------------------------------------------------- - template + template void - AutoCropFilter:: + AutoCropFilter:: SetBackgroundValue(ImagePixelType p) { m_BackgroundValue = p; } @@ -64,9 +64,9 @@ namespace clitk { //-------------------------------------------------------------------- - template + template void - AutoCropFilter:: + AutoCropFilter:: GenerateOutputInformation() { // Superclass @@ -114,10 +114,11 @@ namespace clitk { //-------------------------------------------------------------------- //-------------------------------------------------------------------- - template + template void - AutoCropFilter:: + AutoCropFilter:: GenerateData() { + DD("AutoCropFilter::GenerateData"); // Get input pointers ImageConstPointer input = dynamic_cast(itk::ProcessObject::GetInput(0));