correct output bug

diff --git a/itk/clitkAutoCropFilter.h b/itk/clitkAutoCropFilter.h
index b294efb16b8eb7805540f1bc7537ca3edf8faec4..d060a97ecca5a0c96521f8e165771246f67718d9 100644 (file)
--- a/itk/clitkAutoCropFilter.h
+++ b/itk/clitkAutoCropFilter.h
@@ -29,14 +29,14 @@ namespace clitk {
   */
   //--------------------------------------------------------------------
   
   */
   //--------------------------------------------------------------------
   

-  template <class TImageType>
+  template <class ImageType>

   class ITK_EXPORT AutoCropFilter: 
   class ITK_EXPORT AutoCropFilter: 

-    public itk::ImageToImageFilter<TImageType, TImageType> {
+    public itk::ImageToImageFilter<ImageType, ImageType> {

 
   public:
     /** Standard class typedefs. */
     typedef AutoCropFilter                         Self;
 
   public:
     /** Standard class typedefs. */
     typedef AutoCropFilter                         Self;

-    typedef itk::ImageToImageFilter<TImageType, TImageType>  Superclass;
+    typedef itk::ImageToImageFilter<ImageType, ImageType>  Superclass;

     typedef itk::SmartPointer<Self>                          Pointer;
     typedef itk::SmartPointer<const Self>                    ConstPointer;
     
     typedef itk::SmartPointer<Self>                          Pointer;
     typedef itk::SmartPointer<const Self>                    ConstPointer;
     


@@ -47,7 +47,6 @@ namespace clitk {
     itkTypeMacro(AutoCropFilter, ImageToImageFilter);
 
     /** Some convenient typedefs. */
     itkTypeMacro(AutoCropFilter, ImageToImageFilter);
 
     /** Some convenient typedefs. */

-    typedef TImageType                       ImageType;

     typedef typename ImageType::ConstPointer ImageConstPointer;
     typedef typename ImageType::Pointer      ImagePointer;
     typedef typename ImageType::PixelType    ImagePixelType;
     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 */
     void SetBackgroundValue(ImagePixelType p);
 
     /** ImageDimension constants */

-    itkStaticConstMacro(ImageDimension, unsigned int, TImageType::ImageDimension);
+    itkStaticConstMacro(ImageDimension, unsigned int, ImageType::ImageDimension);

     
   protected:
     AutoCropFilter();
     
   protected:
     AutoCropFilter();

diff --git a/itk/clitkAutoCropFilter.txx b/itk/clitkAutoCropFilter.txx
index 46e35879d61866db3a03c38b6dc6fd856e31b0b4..164bb22e42e41179332c6d15c3494bec89a00962 100644 (file)
--- a/itk/clitkAutoCropFilter.txx
+++ b/itk/clitkAutoCropFilter.txx
@@ -33,9 +33,9 @@
 namespace clitk {
 
   //--------------------------------------------------------------------
 namespace clitk {
 
   //--------------------------------------------------------------------

-  template <class TImageType>
-  AutoCropFilter<TImageType>::
-  AutoCropFilter():itk::ImageToImageFilter<TImageType, TImageType>() {
+  template <class ImageType>
+  AutoCropFilter<ImageType>::
+  AutoCropFilter():itk::ImageToImageFilter<ImageType, ImageType>() {

     this->SetNumberOfRequiredInputs(1);
     m_BackgroundValue  = 0;
   }
     this->SetNumberOfRequiredInputs(1);
     m_BackgroundValue  = 0;
   }


@@ -43,20 +43,20 @@ namespace clitk {
 
 
   //--------------------------------------------------------------------
 
 
   //--------------------------------------------------------------------

-  template <class TImageType>
+  template <class ImageType>

   void 
   void 

-  AutoCropFilter<TImageType>::
-  SetInput(const TImageType * image) {
+  AutoCropFilter<ImageType>::
+  SetInput(const ImageType * image) {

     // Process object is not const-correct so the const casting is required.
     // Process object is not const-correct so the const casting is required.

-    this->SetNthInput(0, const_cast<TImageType *>( image ));
+    this->SetNthInput(0, const_cast<ImageType *>( image ));

   }
   //--------------------------------------------------------------------
   
 
   //--------------------------------------------------------------------
   }
   //--------------------------------------------------------------------
   
 
   //--------------------------------------------------------------------

-  template <class TImageType>
+  template <class ImageType>

   void 
   void 

-  AutoCropFilter<TImageType>::  
+  AutoCropFilter<ImageType>::  

   SetBackgroundValue(ImagePixelType p) {
     m_BackgroundValue = p;
   }
   SetBackgroundValue(ImagePixelType p) {
     m_BackgroundValue = p;
   }


@@ -64,9 +64,9 @@ namespace clitk {
 
 
   //--------------------------------------------------------------------
 
 
   //--------------------------------------------------------------------

-  template <class TImageType>
+  template <class ImageType>

   void 
   void 

-  AutoCropFilter<TImageType>::
+  AutoCropFilter<ImageType>::

   GenerateOutputInformation() {    
 
     // Superclass
   GenerateOutputInformation() {    
 
     // Superclass


@@ -114,10 +114,11 @@ namespace clitk {
   //--------------------------------------------------------------------
    
   //--------------------------------------------------------------------
   //--------------------------------------------------------------------
    
   //--------------------------------------------------------------------

-  template <class TImageType>
+  template <class ImageType>

   void 
   void 

-  AutoCropFilter<TImageType>::
+  AutoCropFilter<ImageType>::

   GenerateData() {
   GenerateData() {

+    DD("AutoCropFilter::GenerateData");

     // Get input pointers
     ImageConstPointer input = dynamic_cast<const ImageType*>(itk::ProcessObject::GetInput(0));
   
     // Get input pointers
     ImageConstPointer input = dynamic_cast<const ImageType*>(itk::ProcessObject::GetInput(0));