From e7549ad940757244860823e954daf13c2dec5ff5 Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau <antoine.regimbeau@c-s.fr> Date: Thu, 6 Jul 2017 15:00:09 +0200 Subject: [PATCH] Branch cleaning after beginner's mistake --- Modules/Feature/Contrast/CMakeLists.txt | 15 ---- .../Contrast/otbContrastEnhancementFilter.cxx | 90 ------------------- .../Contrast/otbContrastEnhancementFilter.h | 0 3 files changed, 105 deletions(-) delete mode 100644 Modules/Feature/Contrast/CMakeLists.txt delete mode 100644 Modules/Feature/Contrast/otbContrastEnhancementFilter.cxx delete mode 100644 Modules/Feature/Contrast/otbContrastEnhancementFilter.h diff --git a/Modules/Feature/Contrast/CMakeLists.txt b/Modules/Feature/Contrast/CMakeLists.txt deleted file mode 100644 index 87d47ca879..0000000000 --- a/Modules/Feature/Contrast/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -cmake_minimum_required (VERSION 2.6) -project (projchambolle) - -find_package(OTB REQUIRED) -include(${OTB_USE_FILE}) - - -set(SOURCES otbContrastEnhancementFilter.cxx) - -add_executable(Contrast otbContrastEnhancementFilter.cxx) - -target_link_libraries(Contrast ${OTB_LIBRARIES}) - - -# message(WARNING "Include dirs : ${OTB_INCLUDE_DIRS}") \ No newline at end of file diff --git a/Modules/Feature/Contrast/otbContrastEnhancementFilter.cxx b/Modules/Feature/Contrast/otbContrastEnhancementFilter.cxx deleted file mode 100644 index 37efcc9775..0000000000 --- a/Modules/Feature/Contrast/otbContrastEnhancementFilter.cxx +++ /dev/null @@ -1,90 +0,0 @@ -#include <iostream> -#include <math.h> -#include "otbImage.h" -#include "otbVectorImage.h" -#include "otbImageFileReader.h" -#include "otbImageFileWriter.h" -#include "itkAdditiveGaussianNoiseImageFilter.h" -#include "otbStreamingStatisticsImageFilter.h" -#include "itkImageLinearIteratorWithIndex.h" -#include "itkMultiplyImageFilter.h" -#include "itkDivideImageFilter.h" -#include "itkAbsImageFilter.h" -#include "itkSubtractImageFilter.h" -#include "itkAddImageFilter.h" -#include "itkSquareImageFilter.h" -#include "itkSqrtImageFilter.h" -#include "itkMaximumImageFilter.h" - -typedef float PixelType; -typedef itk::Image< PixelType , 2> ImageType; -typedef itk::AddImageFilter<ImageType, ImageType, ImageType> AddFilterType; -typedef otb::StreamingStatisticsImageFilter<ImageType> StatFilter; - -ImageType::Pointer -createImagefrom( ImageType::Pointer input ) -{ - ImageType::Pointer cloneImage( ImageType::New() ); - cloneImage->SetRegions( input->GetRequestedRegion() ); - cloneImage->Allocate(); - cloneImage->SetOrigin( input->GetOrigin() ); - return cloneImage ; - -} -void -copyAtoB( const ImageType::Pointer input , - ImageType::Pointer output ) -{ - itk::ImageRegionConstIterator< ImageType > itinp( input , input->GetRequestedRegion() ); - itk::ImageRegionIterator< ImageType > itout( output , output->GetRequestedRegion() ); - itinp.GoToBegin(); - itout.GoToBegin(); - while (!itinp.IsAtEnd()) - { - itout.Set( itinp.Get() ); - ++itout; - ++itinp; - } -} - -void -normL( ImageType::Pointer inputX , - ImageType::Pointer inputY , - ImageType::Pointer output ) -{ - typedef itk::SquareImageFilter< ImageType , ImageType > SquareFilterType; - typedef itk::SqrtImageFilter< ImageType , ImageType > SqrtFitlerType; - SquareFilterType::Pointer square( SquareFilterType::New() ); - SqrtFitlerType::Pointer sqrt( SqrtFitlerType::New() ); - AddFilterType::Pointer add( AddFilterType::New() ); - square->SetInput( inputX ); - square->Update(); - copyAtoB( square->GetOutput() , output ); - add->SetInput1( output ); - square->SetInput( inputY ); - square->Update(); - add->SetInput2( square->GetOutput() ); - sqrt->SetInput( add->GetOutput() ); - sqrt->Update(); - copyAtoB( sqrt->GetOutput() , output ); -} - -int -main( int argc, - char const *argv[] ) -{ - const char * inputFilename = argv[ 1 ]; - const char * outputFilename = argv[ 2 ]; - - - typedef otb::ImageFileReader< ImageType > ReaderType; - - ReaderType::Pointer reader( ReaderType::New() ); - reader->SetFileName( argv[ 1 ] ); - - ImageType::Pointer noisyImage( ImageType::New() ); - - typedef otb::ImageFileWriter<ImageType> WriterType; - WriterType::Pointer writer( WriterType::New()); - return 0; -} \ No newline at end of file diff --git a/Modules/Feature/Contrast/otbContrastEnhancementFilter.h b/Modules/Feature/Contrast/otbContrastEnhancementFilter.h deleted file mode 100644 index e69de29bb2..0000000000 -- GitLab