REFAC : adding a global filter to lighten the app code

Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h

+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef otbCLHistogramEqualizationFilter_h
+#define otbCLHistogramEqualizationFilter_h
+
+#include "itkImageToImageFilter.h"
+#include "otbImage.h"
+#include "otbComputeHistoFilter.h"
+#include "otbComputeGainLutFilter.h"
+#include "otbApplyGainFilter.h"
+
+namespace otb
+{
+
+/** \class CLHistogramEqualizationFilter
+ *  \brief 
+ * \ingroup OTBContrast
+ */
+
+template < class TInputImage , class TOutputImage >
+class ITK_EXPORT CLHistogramEqualizationFilter :
+  public itk::ImageToImageFilter< TInputImage , TOutputImage >
+{
+public :
+  /** typedef for standard classes. */
+
+  typedef TInputImage InputImageType;
+  typedef TOutputImage OutputImageType;
+
+  typedef CLHistogramEqualizationFilter Self;
+  typedef itk::ImageToImageFilter< InputImageType, OutputImageType > Superclass;
+  typedef itk::SmartPointer< Self > Pointer;
+  typedef itk::SmartPointer< const Self > ConstPointer;
+
+  /** Method for creation through the object factory. */
+  itkNewMacro(Self)
+  /** Run-time type information (and related methods). */
+  itkTypeMacro(CLHistogramEqualizationFilter, ImageToImageFilter)
+
+
+protected :
+  CLHistogramEqualizationFilter();
+  ~CLHistogramEqualizationFilter() override {}
+  void PrintSelf(std::ostream& os, itk::Indent indent) const override ;
+
+private :
+  CLHistogramEqualizationFilter(const Self &) = delete ;
+  void operator =(const Self&) = delete ; 
+
+};
+
+}  // End namespace otb
+  
+#ifndef OTB_MANUAL_INSTANTIATION
+#include "otbCLHistogramEqualizationFilter.txx"
+#endif
+
+
+#endif

Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.txx

+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef otbCLHistogramEqualizationFilter_txx
+#define otbCLHistogramEqualizationFilter_txx
+
+#include "otbCLHistogramEqualizationFilter.h"
+#include "itkImageRegionIterator.h"
+#include "itkImageRegionConstIteratorWithIndex.h"
+
+#include <limits>
+
+namespace otb
+{
+template < class TInputImage , class TOutputImage >
+CLHistogramEqualizationFilter < TInputImage , TOutputImage >
+::CLHistogramEqualizationFilter()
+{
+  
+}
+
+/**
+ * Standard "PrintSelf" method
+ */
+template <class TInputImage , class TOutputImage >
+void CLHistogramEqualizationFilter < TInputImage , TOutputImage >
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+  Superclass::PrintSelf(os, indent);
+}
+
+  
+}  // End namespace otb
+
+#endif

Modules/Filtering/Contrast/test/CMakeLists.txt

@@ -25,8 +25,12 @@ otbContrastTestDriver.cxx
 otbComputeHistoFilterNew.cxx
 otbApplyGainFilterNew.cxx
 otbComputeGainLutFilterNew.cxx
+otbCLHistogramEqualizationFilterNew.cxx
 )
 
 add_executable(otbContrastTestDriver ${OTBContrastTests})
 target_link_libraries(otbContrastTestDriver ${OTBContrast-Test_LIBRARIES})
-otb_module_target_label(otbContrastTestDriver)
\ No newline at end of file
+otb_module_target_label(otbContrastTestDriver)
+
+otb_add_test(NAME bfTuCLHistogramEqualizationFilterNew COMMAND otbContrastTestDriver
+  otbCLHistogramEqualizationFilterNew)
\ No newline at end of file

Modules/Filtering/Contrast/test/otbCLHistogramEqualizationFilterNew.cxx

+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+#include "otbImage.h"
+#include "otbCLHistogramEqualizationFilter.h"
+
+int otbCLHistogramEqualizationFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
+{
+  typedef double InputPixelType;
+  const unsigned int Dimension = 2;
+
+  typedef otb::Image< InputPixelType ,  Dimension > InputImageType;
+  typedef otb::CLHistogramEqualizationFilter< InputImageType , InputImageType > 
+    FilterType;
+
+
+  FilterType::Pointer histoEqualize ( FilterType::New() );
+
+  std::cout << histoEqualize << std::endl;
+
+  return EXIT_SUCCESS;
+}
\ No newline at end of file

Modules/Filtering/Contrast/test/otbContrastTestDriver.cxx

@@ -25,4 +25,6 @@ void RegisterTests()
   REGISTER_TEST(otbComputeHistoFilterNew);
   REGISTER_TEST(otbComputeGainLutFilterNew);
   REGISTER_TEST(otbApplyGainFilterNew);
+  REGISTER_TEST(otbCLHistogramEqualizationFilterNew);
+  // REGISTER_TEST(otbHistogramEqualizationFilterValidation);
 }