From f9ae8d5e94b0498bc467f9f8a74fa7b93ec753da Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau <antoine.regimbeau@c-s.fr> Date: Mon, 16 Oct 2017 12:03:41 +0200 Subject: [PATCH] REFAC : change class name BufferFilter to InPlacePassFilter to be consistent with file name --- .../app/otbContrastEnhancement.cxx | 2 +- .../include/otbInPlacePassFilter.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Modules/Applications/AppFiltering/app/otbContrastEnhancement.cxx b/Modules/Applications/AppFiltering/app/otbContrastEnhancement.cxx index 79df4cf4b9..56ca0a434f 100644 --- a/Modules/Applications/AppFiltering/app/otbContrastEnhancement.cxx +++ b/Modules/Applications/AppFiltering/app/otbContrastEnhancement.cxx @@ -119,7 +119,7 @@ public: typedef itk::StreamingImageFilter < FloatVectorImageType , FloatVectorImageType > StreamingImageFilterType; - typedef otb::BufferFilter < FloatImageType > BufferFilterType; + typedef otb::InPlacePassFilter < FloatImageType > BufferFilterType; typedef otb::StreamingHistogramVectorImageFilter < FloatVectorImageType > HistoPersistentFilterType; diff --git a/Modules/Filtering/ImageManipulation/include/otbInPlacePassFilter.h b/Modules/Filtering/ImageManipulation/include/otbInPlacePassFilter.h index 77474b524f..eb2906a6fe 100644 --- a/Modules/Filtering/ImageManipulation/include/otbInPlacePassFilter.h +++ b/Modules/Filtering/ImageManipulation/include/otbInPlacePassFilter.h @@ -18,15 +18,15 @@ * limitations under the License. */ -#ifndef otbBufferFilter_h -#define otbBufferFilter_h +#ifndef otbInPlacePassFilter_h +#define otbInPlacePassFilter_h #include "itkInPlaceImageFilter.h" #include "otbImage.h" namespace otb { -/** \class BufferFilter +/** \class InPlacePassFilter * \brief This filter has the only purpose to recall regions * * This class is implemented to recall regions. Due to ITK implementation @@ -41,14 +41,14 @@ namespace otb */ template < class TInputImage > -class ITK_EXPORT BufferFilter : +class ITK_EXPORT InPlacePassFilter : public itk::InPlaceImageFilter < TInputImage , TInputImage > { public: /** typedef for standard classes. */ typedef TInputImage InputImageType; - typedef BufferFilter Self; + typedef InPlacePassFilter Self; typedef itk::InPlaceImageFilter< InputImageType, InputImageType > Superclass; typedef itk::SmartPointer< Self > Pointer; typedef itk::SmartPointer< const Self > ConstPointer; @@ -57,13 +57,13 @@ public: itkNewMacro(Self) /** Run-time type information (and related methods). */ - itkTypeMacro(BufferFilter, InPlaceImageFilter) + itkTypeMacro(InPlacePassFilter, InPlaceImageFilter) protected: - BufferFilter() { + InPlacePassFilter() { this->InPlaceOn(); } - ~BufferFilter() override {} + ~InPlacePassFilter() override {} virtual void ThreadedGenerateData( const typename InputImageType::RegionType & @@ -71,7 +71,7 @@ protected: itk::ThreadIdType itkNotUsed(threadId) ) override{} private: - BufferFilter(const Self &) = delete ; + InPlacePassFilter(const Self &) = delete ; void operator =(const Self&) = delete ; }; -- GitLab