From 2dc2703f3fcf13c798b1e5ab68cbcfe3502b75f8 Mon Sep 17 00:00:00 2001
From: Gregoire Mercier <gregoire.mercier@telecom-bretagne.eu>
Date: Tue, 30 Jun 2009 10:48:37 +0200
Subject: [PATCH] BUG: remove rescaler in wavelet TVs

---
 Testing/Code/MultiScale/otbWaveletFilterBank.cxx    | 13 ++-----------
 .../Code/MultiScale/otbWaveletPacketTransform.cxx   | 13 ++-----------
 Testing/Code/MultiScale/otbWaveletTransform.cxx     | 12 ++----------
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/Testing/Code/MultiScale/otbWaveletFilterBank.cxx b/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
index d35b3aaac1..72bed2e0ef 100644
--- a/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
+++ b/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
@@ -24,7 +24,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkRescaleIntensityImageFilter.h"
 
 #include "otbWaveletOperator.h"
 #include "otbWaveletFilterBank.h"
@@ -72,18 +71,10 @@ int otbWaveletFilterBank( int argc, char * argv[] )
   invFilter->SetSubsampleImageFactor( filter->GetSubsampleImageFactor() );
 
   /* Saving output */
-  typedef unsigned char OutputPixelType;
-  typedef otb::Image< OutputPixelType, Dimension > OutputImageType;
-  typedef itk::RescaleIntensityImageFilter< ImageType, OutputImageType > RescalerType;
-  RescalerType::Pointer rescaler = RescalerType::New();
-  rescaler->SetOutputMinimum(0);
-  rescaler->SetOutputMaximum(255);
-  rescaler->SetInput( invFilter->GetOutput() );
-
-  typedef otb::ImageFileWriter< OutputImageType > WriterType;
+  typedef otb::ImageFileWriter< ImageType > WriterType;
   WriterType::Pointer writer = WriterType::New();
   writer->SetFileName( outputFileName );
-  writer->SetInput( rescaler->GetOutput() );
+  writer->SetInput( invFilter->GetOutput() );
   writer->Update();
 
   return EXIT_SUCCESS;
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
index 67306a3f5e..8e50f7dbba 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
@@ -24,7 +24,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkRescaleIntensityImageFilter.h"
 
 #include "otbWaveletOperator.h"
 #include "otbWaveletFilterBank.h"
@@ -83,18 +82,10 @@ int otbWaveletPacketTransform( int argc, char * argv[] )
   invFilter->Update();
 
   /* Writing the output */
-  typedef unsigned char OutputPixelType;
-  typedef otb::Image< OutputPixelType, Dimension > OutputImageType;
-  typedef itk::RescaleIntensityImageFilter< ImageType, OutputImageType > RescalerType;
-  RescalerType::Pointer rescaler = RescalerType::New();
-  rescaler->SetOutputMinimum(0);
-  rescaler->SetOutputMaximum(255);
-  rescaler->SetInput( invFilter->GetOutput() );
-
-  typedef otb::ImageFileWriter< OutputImageType > WriterType;
+  typedef otb::ImageFileWriter< ImageType > WriterType;
   WriterType::Pointer writer = WriterType::New();
   writer->SetFileName( outputFileName );
-  writer->SetInput( rescaler->GetOutput() );
+  writer->SetInput( invFilter->GetOutput() );
   writer->Update();
 
   return EXIT_SUCCESS;
diff --git a/Testing/Code/MultiScale/otbWaveletTransform.cxx b/Testing/Code/MultiScale/otbWaveletTransform.cxx
index 118ec0a336..840972003a 100644
--- a/Testing/Code/MultiScale/otbWaveletTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletTransform.cxx
@@ -77,18 +77,10 @@ int otbWaveletTransform( int argc, char * argv[] )
   invFilter->Update();
 
   /* Writing the output */
-  typedef unsigned char OutputPixelType;
-  typedef otb::Image< OutputPixelType, Dimension > OutputImageType;
-  typedef itk::RescaleIntensityImageFilter< ImageType, OutputImageType > RescalerType;
-  RescalerType::Pointer rescaler = RescalerType::New();
-  rescaler->SetOutputMinimum(0);
-  rescaler->SetOutputMaximum(255);
-  rescaler->SetInput( invFilter->GetOutput() );
-
-  typedef otb::ImageFileWriter<OutputImageType> WriterType;
+  typedef otb::ImageFileWriter<ImageType> WriterType;
   WriterType::Pointer writer = WriterType::New();
   writer->SetFileName( outputFileName );
-  writer->SetInput( rescaler->GetOutput() );
+  writer->SetInput( invFilter->GetOutput() );
   writer->Update();
 
   return EXIT_SUCCESS;
-- 
GitLab