ENH: Change template order for edge density filter

Code/BasicFilters/otbEdgeDensityImageFilter.h

@@ -36,7 +36,7 @@ PURPOSE.  See the above copyright notices for more information.
 
 namespace otb
 {
-template <class TInputImage , class TEdgeDetector, class TDensityCount , class TOutputImage>
+template <class TInputImage, class TOutputImage , class TEdgeDetector, class TDensityCount>
 class ITK_EXPORT EdgeDensityImageFilter
       : public itk::ImageToImageFilter<TInputImage, TOutputImage>
 {

Code/BasicFilters/otbEdgeDensityImageFilter.txx

@@ -26,8 +26,8 @@ namespace otb
 /**---------------------------------------------------------
  * Constructor
  ----------------------------------------------------------*/
-template <class TInputImage , class TEdgeDetector, class TDensityCount , class TOutputImage>
-EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage>
+template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
+EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
 ::EdgeDensityImageFilter()
 {
   this->SetNumberOfRequiredInputs( 1 );
@@ -41,8 +41,8 @@ EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage>
 /*---------------------------------------------------------
  * Destructor.c
  ----------------------------------------------------------*/
-template <class TInputImage , class TEdgeDetector, class TDensityCount , class TOutputImage>
-EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage>
+template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
+EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
 ::~EdgeDensityImageFilter()
 {}
 
@@ -53,9 +53,9 @@ EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage>
 /**
 * ThreadedGenerateData Performs the pixel-wise addition
 */
-template <class TInputImage , class TEdgeDetector, class TDensityCount , class TOutputImage>
+template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
 void
-EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage>
+EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
 //::GenerateData()
 ::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId )
 {
@@ -82,9 +82,9 @@ EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage>
 /**
  * Set Detector
  */
-template <class TInputImage , class TEdgeDetector, class TDensityCount , class TOutputImage>
+template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
 void
-EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage>
+EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
 ::SetDetector(DetectorType* detector)
 {
   m_Detector = detector;
@@ -94,10 +94,10 @@ EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage>
 /**
  * Get Detector
  */
-template <class TInputImage , class TEdgeDetector, class TDensityCount , class TOutputImage>
-typename EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage> 
+template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
+typename EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount> 
 ::DetectorType *
-EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage> 
+EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount> 
 ::GetDetector()
 {
   return m_Detector;
@@ -108,9 +108,9 @@ EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage>
 /*----------------------------------------------------------------
   PrintSelf
   -----------------------------------------------------------------*/
-template <class TInputImage , class TEdgeDetector, class TDensityCount , class TOutputImage>
+template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
 void
-EdgeDensityImageFilter<TInputImage, TEdgeDetector, TDensityCount, TOutputImage>  
+EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>  
 ::PrintSelf(std::ostream& os, itk::Indent indent) const
 {
   Superclass::PrintSelf(os, indent);

Examples/FeatureExtraction/EdgeDensityExample.cxx

@@ -128,8 +128,8 @@ int main(int argc, char* argv[] )
   // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  typedef otb::EdgeDensityImageFilter<ImageType, CannyDetectorType,
-                     CountFunctionType, ImageType> EdgeDensityFilterType;
+  typedef otb::EdgeDensityImageFilter<ImageType, ImageType, CannyDetectorType,
+                     CountFunctionType> EdgeDensityFilterType;
 
   /**Instancitation of an object*/
   EdgeDensityFilterType::Pointer    filter =      EdgeDensityFilterType::New();

Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx

@@ -50,7 +50,7 @@ int otbEdgeDensityImageFilter(int argc, char* argv[] )
   typedef otb::BinaryImageDensityFunction<ImageType>                              CountFunctionType;
   typedef itk::CannyEdgeDetectionImageFilter<ImageType , ImageType>               CannyDetectorType;
 
-  typedef otb::EdgeDensityImageFilter<ImageType,CannyDetectorType  ,CountFunctionType , ImageType> EdgeDensityFilterType;
+  typedef otb::EdgeDensityImageFilter<ImageType, ImageType, CannyDetectorType  ,CountFunctionType> EdgeDensityFilterType;
 
   /**Instancitation of an object*/
   EdgeDensityFilterType::Pointer    filter =      EdgeDensityFilterType::New();

Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx

@@ -35,7 +35,7 @@ int otbEdgeDensityImageFilterNew(int, char* [] )
   typedef otb::BinaryImageDensityFunction<ImageType>                              CountFunctionType;
   typedef itk::CannyEdgeDetectionImageFilter<ImageType , ImageType>               CannyDetectorType;
 
-  typedef otb::EdgeDensityImageFilter<ImageType,CannyDetectorType  ,CountFunctionType , ImageType> EdgeDensityFilterType;
+  typedef otb::EdgeDensityImageFilter<ImageType , ImageType , CannyDetectorType  ,CountFunctionType> EdgeDensityFilterType;
 
   /**Instancitation of an object*/
   EdgeDensityFilterType::Pointer    filter =      EdgeDensityFilterType::New();