diff --git a/Code/Common/otbVariableLengthVectorConverter.h b/Code/Common/otbVariableLengthVectorConverter.h
index fac00cf55ed0b8705217681a2e26394c81a94e13..f1a0c43f5146ceff922f35bf2fb6382a811e9b75 100644
--- a/Code/Common/otbVariableLengthVectorConverter.h
+++ b/Code/Common/otbVariableLengthVectorConverter.h
@@ -24,6 +24,7 @@
#include "itkExceptionObject.h"
#include "itkFixedArray.h"
#include "itkHistogram.h"
+#include "itkSmartPointer.h"
namespace otb
@@ -207,9 +208,9 @@ private:
//Histogram
template< class TMeasurement, unsigned int VMeasurementVectorSize, class TFrequencyContainer, class TPrecisionType >
-class ITK_EXPORT VariableLengthVectorConverter<itk::Statistics::Histogram<TMeasurement,
- VMeasurementVectorSize,
- TFrequencyContainer>,
+class ITK_EXPORT VariableLengthVectorConverter<typename itk::SmartPointer< const itk::Statistics::Histogram<TMeasurement,
+ VMeasurementVectorSize,
+ TFrequencyContainer> >,
TPrecisionType> :
public itk::ProcessObject
{
@@ -228,9 +229,9 @@ public:
typedef TPrecisionType OutputPrecisionType;
typedef typename itk::VariableLengthVector<OutputPrecisionType> OutputType;
- typedef typename itk::Statistics::Histogram<TMeasurement,
- VMeasurementVectorSize,
- TFrequencyContainer> InputType;
+ typedef typename itk::SmartPointer< const itk::Statistics::Histogram<TMeasurement,
+ VMeasurementVectorSize,
+ TFrequencyContainer> > InputType;
OutputType Convert(InputType input);
diff --git a/Code/Common/otbVariableLengthVectorConverter.txx b/Code/Common/otbVariableLengthVectorConverter.txx
index 16a84fd82a5fa6aedf4cb6100ddb4bd03ee1c7a4..42931131a5789729f74a6344066f237bb336d95a 100644
--- a/Code/Common/otbVariableLengthVectorConverter.txx
+++ b/Code/Common/otbVariableLengthVectorConverter.txx
@@ -107,21 +107,28 @@ VariableLengthVectorConverter< itk::FixedArray<TInternalInputType, VArrayDimensi
// Histogram
template< class TMeasurement, unsigned int VMeasurementVectorSize, class TFrequencyContainer, class TPrecisionType >
-typename VariableLengthVectorConverter< itk::Statistics::Histogram<TMeasurement, VMeasurementVectorSize, TFrequencyContainer>, TPrecisionType>
+typename VariableLengthVectorConverter< itk::SmartPointer< const itk::Statistics::Histogram<TMeasurement,
+ VMeasurementVectorSize,
+ TFrequencyContainer> >,
+ TPrecisionType>
::OutputType
-VariableLengthVectorConverter< itk::Statistics::Histogram<TMeasurement, VMeasurementVectorSize, TFrequencyContainer>, TPrecisionType>
+VariableLengthVectorConverter< itk::SmartPointer<const itk::Statistics::Histogram<TMeasurement,
+ VMeasurementVectorSize,
+ TFrequencyContainer> >,
+ TPrecisionType>
::Convert(InputType input)
{
- unsigned int nbBins, rsltIdx = 0;
+ unsigned int rsltIdx = 0;
+ itk::Size<1> nbBins;
OutputType result;
- nbBins = input.GetSize();
-
- result.SetSize(nbBins);
+ nbBins[0] = input->GetSize()[0];
+
+ result.SetSize(nbBins[0]);
- for (unsigned int i=0; i<nbBins; i++)
+ for (unsigned int i=0; i<nbBins[0]; i++)
{
- result[rsltIdx] = static_cast<OutputPrecisionType>(input.GetFrequency(i));
+ result[rsltIdx] = static_cast<OutputPrecisionType>(input->GetFrequency(i));
rsltIdx ++;
}
diff --git a/Code/FeatureExtraction/otbImageFunctionAdapter.h b/Code/FeatureExtraction/otbImageFunctionAdapter.h
deleted file mode 100644
index e66a57bda16d77b24d45b036b0ae6f954c7c5aa6..0000000000000000000000000000000000000000
--- a/Code/FeatureExtraction/otbImageFunctionAdapter.h
+++ /dev/null
@@ -1,493 +0,0 @@
-/*=========================================================================
-
- Program: ORFEO Toolbox
- Language: C++
- Date: $Date$
- Version: $Revision$
-
-
- Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
- See OTBCopyright.txt for details.
-
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef __otbImageFunctionAdapter_h
-#define __otbImageFunctionAdapter_h
-
-#include "itkImageFunction.h"
-#include "itkNumericTraits.h"
-
-#include "otbFourierMellinDescriptorsImageFunction.h"
-#include "otbRealMomentsImageFunction.h"
-#include "otbComplexMomentsImageFunction.h"
-#include "otbFlusserMomentsImageFunction.h"
-#include "otbHuMomentsImageFunction.h"
-#include "otbRadiometricMomentsImageFunction.h"
-#include "otbLocalHistogramImageFunction.h"
-
-#include <complex>
-
-namespace otb
-{
-
-
-template< class TInputImage, class TInternalImageFunctionType, class TCoordRep = double >
-class ITK_EXPORT ImageFunctionAdapterBase :
- public itk::ImageFunction< TInputImage,
- itk::VariableLengthVector<
- ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>
- ::RealType >,
- TCoordRep >
-{
- public:
- // Standard class typedefs. //
- typedef ImageFunctionAdapterBase Self;
- typedef itk::ImageFunction< TInputImage,
- itk::VariableLengthVector<
- ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>
- ::RealType >,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- // Run-time type information (and related methods). //
- itkTypeMacro(ImageFunctionAdapterBase, ImageFunction);
-
- // Method for creation through the object factory. //
- itkNewMacro(Self);
-
- // InputImageType typedef support. //
- typedef TInputImage InputImageType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::PointType PointType;
- typedef typename Superclass::OutputType OutputType;
- typedef typename OutputType::ValueType OutputValueType;
-
- // Template Partial Specialization Specific typedef //
- typedef TInternalImageFunctionType InternalImageFunctionType;
- typedef typename InternalImageFunctionType::Pointer InternalImageFunctionPointerType;
-
- // Dimension of the underlying image. //
- itkStaticConstMacro(ImageDimension, unsigned int,
- InputImageType::ImageDimension);
-
- // Evalulate the function at specified index //
- virtual OutputType EvaluateAtIndex(const IndexType& index) const
- {
- OutputType result;
-
- result.SetSize(1);
-
- result[0] = 0.0;
-
- return result;
- };
-
- // Evaluate the function at non-integer positions //
- virtual OutputType Evaluate(const PointType& point) const
- {
- IndexType index;
- this->ConvertPointToNearestIndex(point, index);
- return this->EvaluateAtIndex(index);
- }
- virtual OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const
- {
- IndexType index;
- this->ConvertContinuousIndexToNearestIndex(cindex, index);
- return this->EvaluateAtIndex(index);
- }
-
- // Get/Set the internal image function //
- InternalImageFunctionPointerType GetImageFunction() const
- {
- return m_ImageFunction;
- }
-
-protected:
- ImageFunctionAdapterBase()
- {
- m_ImageFunction = InternalImageFunctionType::New();
- }
-
- virtual ~ImageFunctionAdapterBase() {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const
- {
- Superclass::PrintSelf(os, indent);
- os << indent << "Internal Image Function: " << m_ImageFunction << std::endl;
- }
-
-private:
- ImageFunctionAdapterBase(const Self &); //purposely not implemented
- void operator =(const Self&); //purposely not implemented
-
- // Internal Image Function //
- InternalImageFunctionPointerType m_ImageFunction;
-};
-
-
-// ----- Template Partial Specialization ----- //
-
-//Dummy
-template< class TInputImage, class TInternalImageFunctionType, class TCoordRep = double >
-class ITK_EXPORT ImageFunctionAdapter :
- public otb::ImageFunctionAdapterBase< TInputImage,
- TInternalImageFunctionType,
- TCoordRep >
-{
-public:
- typedef ImageFunctionAdapter Self;
- typedef ImageFunctionAdapterBase< TInputImage,
- TInternalImageFunctionType,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- itkTypeMacro(ImageFunctionAdapter, ImageFunction);
- itkNewMacro(Self);
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::OutputType OutputType;
- typedef typename Superclass::InternalImageFunctionType InternalImageFunctionType;
-
- virtual OutputType EvaluateAtIndex(const IndexType& index) const;
-
-protected:
- ImageFunctionAdapter() {}
- virtual ~ImageFunctionAdapter() {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
-private:
- ImageFunctionAdapter(const Self &); //purposely not implemented
- void operator =(const Self&); //purposely not implemented
-};
-
-
-//FourierMellinDescriptors
-template< class TInputImage, class TCoordRep >
-class ITK_EXPORT ImageFunctionAdapter< TInputImage,
- otb::FourierMellinDescriptorsImageFunction<TInputImage, TCoordRep>,
- TCoordRep > :
- public otb::ImageFunctionAdapterBase< TInputImage,
- FourierMellinDescriptorsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep >
-{
-public:
- // Standard class typedefs. //
- typedef ImageFunctionAdapter Self;
- typedef ImageFunctionAdapterBase< TInputImage,
- FourierMellinDescriptorsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- // Run-time type information (and related methods). //
- itkTypeMacro(ImageFunctionAdapter, ImageFunction);
- // Method for creation through the object factory. //
- itkNewMacro(Self);
- // Usefull typedefs //
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::OutputType OutputType;
- // Template Partial Specialization Specific typedef //
- typedef typename Superclass::InternalImageFunctionType InternalImageFunctionType;
-
- // Evalulate the function at specified index //
- virtual OutputType EvaluateAtIndex(const IndexType& index) const;
-
-protected:
- ImageFunctionAdapter() {}
- virtual ~ImageFunctionAdapter() {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
-private:
- ImageFunctionAdapter(const Self &); //purposely not implemented
- void operator =(const Self&); //purposely not implemented
-};
-
-//RealMoments
-template< class TInputImage, class TCoordRep >
-class ITK_EXPORT ImageFunctionAdapter< TInputImage,
- otb::RealMomentsImageFunction<TInputImage, TCoordRep>,
- TCoordRep > :
- public otb::ImageFunctionAdapterBase< TInputImage,
- RealMomentsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep >
-{
-public:
- // Standard class typedefs. //
- typedef ImageFunctionAdapter Self;
- typedef ImageFunctionAdapterBase< TInputImage,
- RealMomentsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- // Run-time type information (and related methods). //
- itkTypeMacro(ImageFunctionAdapter, ImageFunction);
- // Method for creation through the object factory. //
- itkNewMacro(Self);
- // Usefull typedefs //
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::OutputType OutputType;
- // Template Partial Specialization Specific typedef //
- typedef typename Superclass::InternalImageFunctionType InternalImageFunctionType;
-
- // Evalulate the function at specified index //
- virtual OutputType EvaluateAtIndex(const IndexType& index) const;
-
-protected:
- ImageFunctionAdapter() {}
- virtual ~ImageFunctionAdapter() {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
-private:
- ImageFunctionAdapter(const Self &); //purposely not implemented
- void operator =(const Self&); //purposely not implemented
-};
-
-//ComplexMoments
-template< class TInputImage, class TCoordRep >
-class ITK_EXPORT ImageFunctionAdapter< TInputImage,
- otb::ComplexMomentsImageFunction< TInputImage, TCoordRep>,
- TCoordRep > :
- public otb::ImageFunctionAdapterBase< TInputImage,
- ComplexMomentsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep >
-{
-public:
- // Standard class typedefs. //
- typedef ImageFunctionAdapter Self;
- typedef ImageFunctionAdapterBase< TInputImage,
- ComplexMomentsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- // Run-time type information (and related methods). //
- itkTypeMacro(ImageFunctionAdapter, ImageFunction);
- // Method for creation through the object factory. //
- itkNewMacro(Self);
- // Usefull typedefs //
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::OutputType OutputType;
- // Template Partial Specialization Specific typedef //
- typedef typename Superclass::InternalImageFunctionType InternalImageFunctionType;
-
- // Evalulate the function at specified index //
- virtual OutputType EvaluateAtIndex(const IndexType& index) const;
-
-protected:
- ImageFunctionAdapter() {}
- virtual ~ImageFunctionAdapter() {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
-private:
- ImageFunctionAdapter(const Self &); //purposely not implemented
- void operator =(const Self&); //purposely not implemented
-};
-
-//FlusserMoments
-template< class TInputImage, class TCoordRep >
-class ITK_EXPORT ImageFunctionAdapter< TInputImage,
- otb::FlusserMomentsImageFunction< TInputImage, TCoordRep>,
- TCoordRep > :
- public otb::ImageFunctionAdapterBase< TInputImage,
- FlusserMomentsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep >
-{
-public:
- // Standard class typedefs. //
- typedef ImageFunctionAdapter Self;
- typedef ImageFunctionAdapterBase< TInputImage,
- FlusserMomentsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- // Run-time type information (and related methods). //
- itkTypeMacro(ImageFunctionAdapter, ImageFunction);
- // Method for creation through the object factory. //
- itkNewMacro(Self);
- // Usefull typedefs //
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::OutputType OutputType;
- // Template Partial Specialization Specific typedef //
- typedef typename Superclass::InternalImageFunctionType InternalImageFunctionType;
-
- // Evalulate the function at specified index //
- virtual OutputType EvaluateAtIndex(const IndexType& index) const;
-
-protected:
- ImageFunctionAdapter() {};
- virtual ~ImageFunctionAdapter() {};
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
-private:
- ImageFunctionAdapter(const Self &); //purposely not implemented
- void operator =(const Self&); //purposely not implemented
-};
-
-//HuMoments
-template< class TInputImage, class TCoordRep >
-class ITK_EXPORT ImageFunctionAdapter< TInputImage,
- otb::HuMomentsImageFunction< TInputImage, TCoordRep>,
- TCoordRep > :
- public otb::ImageFunctionAdapterBase< TInputImage,
- HuMomentsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep >
-{
-public:
- // Standard class typedefs. //
- typedef ImageFunctionAdapter Self;
- typedef ImageFunctionAdapterBase< TInputImage,
- HuMomentsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- // Run-time type information (and related methods). //
- itkTypeMacro(ImageFunctionAdapter, ImageFunction);
- // Method for creation through the object factory. //
- itkNewMacro(Self);
- // Usefull typedefs //
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::OutputType OutputType;
- // Template Partial Specialization Specific typedef //
- typedef typename Superclass::InternalImageFunctionType InternalImageFunctionType;
-
- // Evalulate the function at specified index //
- virtual OutputType EvaluateAtIndex(const IndexType& index) const;
-
-protected:
- ImageFunctionAdapter() {}
- virtual ~ImageFunctionAdapter() {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
-private:
- ImageFunctionAdapter(const Self &); //purposely not implemented
- void operator =(const Self&); //purposely not implemented
-};
-
-//RadiometricMoments
-template< class TInputImage, class TCoordRep >
-class ITK_EXPORT ImageFunctionAdapter< TInputImage,
- otb::RadiometricMomentsImageFunction< TInputImage, TCoordRep>,
- TCoordRep > :
- public otb::ImageFunctionAdapterBase< TInputImage,
- RadiometricMomentsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep >
-{
-public:
- // Standard class typedefs. //
- typedef ImageFunctionAdapter Self;
- typedef ImageFunctionAdapterBase< TInputImage,
- RadiometricMomentsImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- // Run-time type information (and related methods). //
- itkTypeMacro(ImageFunctionAdapter, ImageFunction);
- // Method for creation through the object factory. //
- itkNewMacro(Self);
- // Usefull typedefs //
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::OutputType OutputType;
- // Template Partial Specialization Specific typedef //
- typedef typename Superclass::InternalImageFunctionType InternalImageFunctionType;
-
- // Evalulate the function at specified index //
- virtual OutputType EvaluateAtIndex(const IndexType& index) const;
-
-protected:
- ImageFunctionAdapter() {}
- virtual ~ImageFunctionAdapter() {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
-private:
- ImageFunctionAdapter(const Self &); //purposely not implemented
- void operator =(const Self&); //purposely not implemented
-};
-
-
-//LocalHistogram
-template< class TInputImage, class TCoordRep >
-class ITK_EXPORT ImageFunctionAdapter< TInputImage,
- otb::LocalHistogramImageFunction< TInputImage, TCoordRep>,
- TCoordRep > :
- public otb::ImageFunctionAdapterBase< TInputImage,
- LocalHistogramImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep >
-{
-public:
- // Standard class typedefs. //
- typedef ImageFunctionAdapter Self;
- typedef ImageFunctionAdapterBase< TInputImage,
- LocalHistogramImageFunction<
- TInputImage,
- TCoordRep >,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- // Run-time type information (and related methods).
- itkTypeMacro(ImageFunctionAdapter, ImageFunction);
- // Method for creation through the object factory.
- itkNewMacro(Self);
- // Usefull typedefs //
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::OutputType OutputType;
- // Template Partial Specialization Specific typedef
- typedef typename Superclass::InternalImageFunctionType InternalImageFunctionType;
-
- // Evalulate the function at specified index //
- virtual OutputType EvaluateAtIndex(const IndexType& index) const;
-
-protected:
- ImageFunctionAdapter() {}
- virtual ~ImageFunctionAdapter() {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
-private:
- ImageFunctionAdapter(const Self &); //purposely not implemented
- void operator =(const Self&); //purposely not implemented
-};
-
-
-} // end namespace otb
-
-#ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageFunctionAdapter.txx"
-#endif
-
-#endif
diff --git a/Code/FeatureExtraction/otbImageFunctionAdapter.txx b/Code/FeatureExtraction/otbImageFunctionAdapter.txx
deleted file mode 100644
index 1b55cd7edae2bcd4648d89ef836bf314b1f00181..0000000000000000000000000000000000000000
--- a/Code/FeatureExtraction/otbImageFunctionAdapter.txx
+++ /dev/null
@@ -1,342 +0,0 @@
-/*=========================================================================
-
- Program: ORFEO Toolbox
- Language: C++
- Date: $Date$
- Version: $Revision$
-
-
- Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
- See OTBCopyright.txt for details.
-
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef __otbImageFunctionAdapter_txx
-#define __otbImageFunctionAdapter_txx
-
-#include "otbImageFunctionAdapter.h"
-
-namespace otb
-{
-/** ----- Template Partial Specialization ----- **/
-// Dummy
-template <class TInputImage, class TInternalImageFunctionType, class TCoordRep>
-typename ImageFunctionAdapter<TInputImage, TInternalImageFunctionType, TCoordRep >::OutputType
-ImageFunctionAdapter <TInputImage, TInternalImageFunctionType, TCoordRep >
-::EvaluateAtIndex(const IndexType& index) const
-{
- OutputType result;
- result.SetSize(1);
- result[0] = 0.0;
- return result;
-}
-template <class TInputImage, class TInternalImageFunctionType, class TCoordRep >
-void
-ImageFunctionAdapter <TInputImage, TInternalImageFunctionType, TCoordRep >
-::PrintSelf(std::ostream& os, itk::Indent indent) const
-{
- Superclass::PrintSelf(os, indent);
-}
-
-
-// Fourier-Mellin Descriptors
-template <class TInputImage, class TCoordRep>
-typename ImageFunctionAdapter<TInputImage,
- FourierMellinDescriptorsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >::OutputType
-ImageFunctionAdapter<TInputImage,
- FourierMellinDescriptorsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::EvaluateAtIndex(const IndexType& index) const
-{
- unsigned int p, q, rsltIdx = 0;
- OutputType result;
-
- p = this->GetImageFunction()->GetPmax();
- q = this->GetImageFunction()->GetQmax();
-
- result.SetSize((p+1)*(q+1));
-
- typename InternalImageFunctionType::OutputType tmpResult;
- this->GetImageFunction()->SetInputImage(this->GetInputImage());
- tmpResult = this->GetImageFunction()->EvaluateAtIndex(index);
-
- for (unsigned int i=0; i<=p; i++)
- {
- for (unsigned int j=0; j<=q; j++)
- {
- result[rsltIdx] = tmpResult.at(i).at(j);
- rsltIdx ++;
- }
- }
-
- return result;
-}
-
-template <class TInputImage, class TCoordRep>
-void
-ImageFunctionAdapter<TInputImage,
- FourierMellinDescriptorsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::PrintSelf(std::ostream& os, itk::Indent indent) const
-{
- Superclass::PrintSelf(os, indent);
-}
-
-
-// Real Moments
-template <class TInputImage, class TCoordRep>
-typename ImageFunctionAdapter<TInputImage,
- RealMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >::OutputType
-ImageFunctionAdapter<TInputImage,
- RealMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::EvaluateAtIndex(const IndexType& index) const
-{
- unsigned int p, q, rsltIdx = 0;
- OutputType result;
-
- p = this->GetImageFunction()->GetPmax();
- q = this->GetImageFunction()->GetQmax();
-
- result.SetSize((p+1)*(q+1));
-
- typename InternalImageFunctionType::OutputType tmpResult;
- this->GetImageFunction()->SetInputImage(this->GetInputImage());
- tmpResult = this->GetImageFunction()->EvaluateAtIndex(index);
-
- for (unsigned int i=0; i<=p; i++)
- {
- for (unsigned int j=0; j<=q; j++)
- {
- result[rsltIdx] = tmpResult.at(i).at(j);
- rsltIdx ++;
- }
- }
-
- return result;
-}
-
-template <class TInputImage, class TCoordRep>
-void
-ImageFunctionAdapter<TInputImage,
- RealMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::PrintSelf(std::ostream& os, itk::Indent indent) const
-{
- Superclass::PrintSelf(os, indent);
-}
-
-
-//Complex Moments
-template <class TInputImage, class TCoordRep>
-typename ImageFunctionAdapter<TInputImage,
- ComplexMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >::OutputType
-ImageFunctionAdapter<TInputImage,
- ComplexMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::EvaluateAtIndex(const IndexType& index) const
-{
- unsigned int p, q, rsltIdx = 0;
- OutputType result;
-
- p = this->GetImageFunction()->GetPmax();
- q = this->GetImageFunction()->GetQmax();
-
- result.SetSize((p+1)*(q+1)*2);
-
- typename InternalImageFunctionType::OutputType tmpResult;
- this->GetImageFunction()->SetInputImage(this->GetInputImage());
- tmpResult = this->GetImageFunction()->EvaluateAtIndex(index);
-
- for (unsigned int i=0; i<=p; i++)
- {
- for (unsigned int j=0; j<=q; j++)
- {
- result[rsltIdx] = tmpResult.at(i).at(j).real();
- rsltIdx ++;
- result[rsltIdx] = tmpResult.at(i).at(j).imag();
- rsltIdx ++;
- }
- }
-
- return result;
-}
-
-template <class TInputImage, class TCoordRep>
-void
-ImageFunctionAdapter<TInputImage,
- ComplexMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::PrintSelf(std::ostream& os, itk::Indent indent) const
-{
- Superclass::PrintSelf(os, indent);
-}
-
-
-//Flusser Moments
-template <class TInputImage, class TCoordRep>
-typename ImageFunctionAdapter<TInputImage,
- FlusserMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >::OutputType
-ImageFunctionAdapter<TInputImage,
- FlusserMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::EvaluateAtIndex(const IndexType& index) const
-{
- unsigned int rsltIdx = 0;
- OutputType result;
-
- result.SetSize(11);
-
- typename InternalImageFunctionType::OutputType tmpResult;
- this->GetImageFunction()->SetInputImage(this->GetInputImage());
- tmpResult = this->GetImageFunction()->EvaluateAtIndex(index);
-
- for (unsigned int i=0; i<11; i++)
- {
- result[rsltIdx] = tmpResult[i];
- rsltIdx ++;
- }
-
- return result;
-}
-
-template <class TInputImage, class TCoordRep>
-void
-ImageFunctionAdapter<TInputImage,
- FlusserMomentsImageFunction<TInputImage, TCoordRep >,
- TCoordRep >
-::PrintSelf(std::ostream& os, itk::Indent indent) const
-{
- Superclass::PrintSelf(os, indent);
-}
-
-
-//Hu Moments
-template <class TInputImage, class TCoordRep>
-typename ImageFunctionAdapter<TInputImage,
- HuMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >::OutputType
-ImageFunctionAdapter<TInputImage,
- HuMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::EvaluateAtIndex(const IndexType& index) const
-{
- unsigned int rsltIdx = 0;
- OutputType result;
-
- result.SetSize(7);
-
- typename InternalImageFunctionType::OutputType tmpResult;
- this->GetImageFunction()->SetInputImage(this->GetInputImage());
- tmpResult = this->GetImageFunction()->EvaluateAtIndex(index);
-
- for (unsigned int i=0; i<7; i++)
- {
- result[rsltIdx] = tmpResult[i];
- rsltIdx ++;
- }
-
- return result;
-}
-
-template <class TInputImage, class TCoordRep>
-void
-ImageFunctionAdapter<TInputImage,
- HuMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::PrintSelf(std::ostream& os, itk::Indent indent) const
-{
- Superclass::PrintSelf(os, indent);
-}
-
-
-//Radiometric Moments
-template <class TInputImage, class TCoordRep>
-typename ImageFunctionAdapter<TInputImage,
- RadiometricMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >::OutputType
-ImageFunctionAdapter<TInputImage,
- RadiometricMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::EvaluateAtIndex(const IndexType& index) const
-{
- unsigned int rsltIdx = 0;
- OutputType result;
-
- result.SetSize(4);
-
- typename InternalImageFunctionType::OutputType tmpResult;
- this->GetImageFunction()->SetInputImage(this->GetInputImage());
- tmpResult = this->GetImageFunction()->EvaluateAtIndex(index);
-
- for (unsigned int i=0; i<4; i++)
- {
- result[rsltIdx] = tmpResult[i];
- rsltIdx ++;
- }
-
- return result;
-}
-
-template <class TInputImage, class TCoordRep>
-void
-ImageFunctionAdapter<TInputImage,
- RadiometricMomentsImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::PrintSelf(std::ostream& os, itk::Indent indent) const
-{
- Superclass::PrintSelf(os, indent);
-}
-
-
-//Local Histogramm
-template <class TInputImage, class TCoordRep>
-typename ImageFunctionAdapter<TInputImage,
- LocalHistogramImageFunction< TInputImage, TCoordRep >,
- TCoordRep >::OutputType
-ImageFunctionAdapter<TInputImage,
- LocalHistogramImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::EvaluateAtIndex(const IndexType& index) const
-{
- unsigned int nbBins, rsltIdx = 0;
- OutputType result;
-
- nbBins = this->GetImageFunction()->GetNumberOfHistogramBins();
-
- result.SetSize(nbBins);
-
- typename InternalImageFunctionType::OutputType tmpResult;
- this->GetImageFunction()->SetInputImage(this->GetInputImage());
- tmpResult = this->GetImageFunction()->EvaluateAtIndex(index);
-
- for (unsigned int i=0; i<nbBins; i++)
- {
- result[rsltIdx] = tmpResult->GetFrequency(i);
- rsltIdx ++;
- }
-
- return result;
-}
-
-template <class TInputImage, class TCoordRep>
-void
-ImageFunctionAdapter<TInputImage,
- LocalHistogramImageFunction< TInputImage, TCoordRep >,
- TCoordRep >
-::PrintSelf(std::ostream& os, itk::Indent indent) const
-{
- Superclass::PrintSelf(os, indent);
-}
-
-} // end namespace otb
-
-#endif
diff --git a/Code/FeatureExtraction/otbLocalHistogramImageFunction.h b/Code/FeatureExtraction/otbLocalHistogramImageFunction.h
index fe4253665c364ff424470ed8e27a5d0c46fde565..821cdab3d1674088e4ddcdeb83d6c00c9fafe1bc 100644
--- a/Code/FeatureExtraction/otbLocalHistogramImageFunction.h
+++ b/Code/FeatureExtraction/otbLocalHistogramImageFunction.h
@@ -20,7 +20,7 @@
#include "itkImageFunction.h"
#include "itkFixedArray.h"
-#include "itkScalarImageToHistogramGenerator.h"
+#include "itkHistogram.h"
#include "itkNumericTraits.h"
namespace otb
@@ -40,14 +40,14 @@ namespace otb
template <class TInputImage, class TCoordRep = double >
class ITK_EXPORT LocalHistogramImageFunction :
public itk::ImageFunction< TInputImage,
- typename itk::Statistics::ScalarImageToHistogramGenerator<TInputImage>::HistogramConstPointer,
+ typename itk::Statistics::Histogram<typename TInputImage::PixelType>::Pointer,
TCoordRep >
{
public:
/** Standard class typedefs. */
typedef LocalHistogramImageFunction Self;
typedef itk::ImageFunction< TInputImage,
- typename itk::Statistics::ScalarImageToHistogramGenerator<TInputImage>::HistogramConstPointer,
+ typename itk::Statistics::Histogram<typename TInputImage::PixelType>::Pointer,
TCoordRep > Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -65,11 +65,8 @@ public:
typedef typename Superclass::PointType PointType;
typedef typename Superclass::OutputType OutputType;
- typedef itk::Statistics::ScalarImageToHistogramGenerator<TInputImage> HistogramGeneratorType;
- typedef typename HistogramGeneratorType::GeneratorType GeneratorType;
- typedef typename GeneratorType::HistogramType HistogramType;
- typedef typename HistogramType::Pointer HistogramPointer;
- typedef typename GeneratorType::Pointer GeneratorPointer;
+ typedef itk::Statistics::Histogram<typename TInputImage::PixelType> HistogramType;
+ typedef typename HistogramType::Pointer HistogramPointer;
typedef TCoordRep CoordRepType;
diff --git a/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx b/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx
index 4d45866ffd87dfb970039959398632b76e362a9c..4af8fe109c0839e39e1d7dedfb8894fcc9f4034c 100644
--- a/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx
+++ b/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx
@@ -19,7 +19,6 @@
#define __otbLocalHistogramImageFunction_txx
#include "otbLocalHistogramImageFunction.h"
-#include "itkImageToHistogramGenerator.h"
#include "itkConstNeighborhoodIterator.h"
#include "itkNumericTraits.h"
#include "itkMacro.h"
@@ -55,27 +54,37 @@ typename LocalHistogramImageFunction<TInputImage,TCoordRep>::OutputType
LocalHistogramImageFunction<TInputImage,TCoordRep>
::EvaluateAtIndex(const IndexType& index) const
{
- typename HistogramGeneratorType::Pointer histogramGenerator = HistogramGeneratorType::New();
- histogramGenerator->SetNumberOfBins( this->GetNumberOfHistogramBins() );
- histogramGenerator->SetHistogramMin( this->GetHistogramMin() );
- histogramGenerator->SetHistogramMax( this->GetHistogramMax() );
+
+ typename HistogramType::Pointer histogram = HistogramType::New();
+
+ typename HistogramType::SizeType size ;
+ size.Fill( this->GetNumberOfHistogramBins() ) ;
+
+ typename HistogramType::MeasurementVectorType lowerBound;
+ typename HistogramType::MeasurementVectorType upperBound;
+
+ lowerBound.Fill( static_cast<typename HistogramType::MeasurementType>(this->GetHistogramMin()) ) ;
+ upperBound.Fill( static_cast<typename HistogramType::MeasurementType>(this->GetHistogramMax()) ) ;
+
+ histogram->Initialize(size, lowerBound, upperBound ) ;
+ histogram->SetToZero();
// Check for input image
if( !this->GetInputImage() )
{
- return histogramGenerator->GetOutput();
+ return histogram;
}
// Check for out of buffer
if ( !this->IsInsideBuffer( index ) )
{
- return histogramGenerator->GetOutput();
+ return histogram;
}
- typename InputImageType::Pointer currentImage;
- currentImage = InputImageType::New();
+ typename InputImageType::ConstPointer currentImage = this->GetInputImage();
- currentImage = const_cast<InputImageType *>(this->GetInputImage());
+ typename itk::ConstNeighborhoodIterator<InputImageType>::RadiusType radius;
+ radius.Fill( this->GetNeighborhoodRadius() );
typename InputImageType::RegionType region;
typename InputImageType::IndexType currentIndex;
@@ -90,20 +99,25 @@ LocalHistogramImageFunction<TInputImage,TCoordRep>
region.SetIndex(currentIndex);
region.SetSize(currentSize);
- if(region.Crop(currentImage->GetRequestedRegion()) )
- {
- typedef itk::ExtractImageFilter<InputImageType,InputImageType> ExtractFilterType;
- typename ExtractFilterType::Pointer extractFilter = ExtractFilterType::New();
+ itk::ConstNeighborhoodIterator<InputImageType> it(radius, currentImage, region);
- extractFilter->SetInput(this->GetInputImage());
- extractFilter->SetExtractionRegion(region);
- extractFilter->Update();
+ float numberOfPixelsCounted = 0.0;
- histogramGenerator->SetInput( extractFilter->GetOutput() );
- histogramGenerator->Compute();
+ it.GoToBegin();
+ while (!it.IsAtEnd())
+ {
+ typename HistogramType::MeasurementVectorType sample;
+ for (unsigned int j = 0; j < sample.Size(); ++j)
+ {
+ sample[j] = it.GetPixel(j);
+ }
+ if( histogram->IncreaseFrequency(sample, 1) )
+ {
+ ++numberOfPixelsCounted;
+ }
+ ++it;
}
-
- return histogramGenerator->GetOutput();
+ return histogram;
}
} // namespace otb
diff --git a/Code/FeatureExtraction/otbMetaImageFunction.txx b/Code/FeatureExtraction/otbMetaImageFunction.txx
index 94239e2ba64cb89374e04f27b979c9bb0bd048ff..197c08faba0ad2597994febd79468023035b69db 100644
--- a/Code/FeatureExtraction/otbMetaImageFunction.txx
+++ b/Code/FeatureExtraction/otbMetaImageFunction.txx
@@ -19,7 +19,7 @@
#define __otbMetaImageFunction_txx
#include "otbMetaImageFunction.h"
-#include "otbImageFunctionAdapter.h"
+#include "otbImageFunctionAdaptor.h"
#include <algorithm>
diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt
index eb837764ebed4b23525aaced079c244b3032ae54..64fe991fef73a160e9301a7bc4c68aa1382da80d 100644
--- a/Testing/Code/FeatureExtraction/CMakeLists.txt
+++ b/Testing/Code/FeatureExtraction/CMakeLists.txt
@@ -1496,11 +1496,14 @@ ADD_TEST(feTuLocalHistogramImageFunctionNew ${FEATUREEXTRACTION_TESTS16}
otbLocalHistogramImageFunctionNew
)
-ADD_TEST(feTuLocalHistogramImageFunctionTest ${FEATUREEXTRACTION_TESTS16}
- otbLocalHistogramImageFunctionTest
- ${INPUTDATA}/poupees_1canal.hd
- ${TEMP}/feLocalHistogramImage.txt
- )
+ADD_TEST(feTvLocalHistogramImageFunctionTest ${FEATUREEXTRACTION_TESTS16}
+--compare-ascii ${EPSILON_8}
+ ${BASELINE_FILES}/feLocalHistogramImage.txt
+ ${TEMP}/feLocalHistogramImage.txt
+ otbLocalHistogramImageFunctionTest
+ ${INPUTDATA}/prison_toulouse.tif
+ ${TEMP}/feLocalHistogramImage.txt
+)
# ------- otb::ImageFunctionAdapter -------------
diff --git a/Testing/Code/FeatureExtraction/otbImageFunctionAdaptor.cxx b/Testing/Code/FeatureExtraction/otbImageFunctionAdaptor.cxx
index 2169f78968f557389212666a4ffd0fa46c57033f..2f7fc61774aaa657d4f2f5a7d969a92d3ffb8d3d 100644
--- a/Testing/Code/FeatureExtraction/otbImageFunctionAdaptor.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageFunctionAdaptor.cxx
@@ -266,7 +266,7 @@ int otbImageFunctionAdaptor(int argc, char * argv[])
<< "\t - resultRaM : " << resultRaM[i] << std::endl;
rsltIdx ++;
}
-/*
+
LHFunction->SetInputImage(reader->GetOutput());
LHFunction->SetNeighborhoodRadius(5);
LHFunction->SetNumberOfHistogramBins(64);
@@ -290,7 +290,7 @@ int otbImageFunctionAdaptor(int argc, char * argv[])
<< "\t - resultLH : " << resultLH->GetFrequency(i) << std::endl;
rsltIdx ++;
}
- */
+
error = vcl_sqrt(error);
std::cout << std::endl << "Error : " << error << std::endl
<< std::endl;
diff --git a/Testing/Code/FeatureExtraction/otbLocalHistogramImageFunctionTest.cxx b/Testing/Code/FeatureExtraction/otbLocalHistogramImageFunctionTest.cxx
index e6244b188395ad813ed20d84a2161d361eae5b3f..ac1145cb9c1c1aef37dbe96a1c7377a6c09e6a3d 100644
--- a/Testing/Code/FeatureExtraction/otbLocalHistogramImageFunctionTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbLocalHistogramImageFunctionTest.cxx
@@ -30,7 +30,7 @@ int otbLocalHistogramImageFunctionTest(int argc, char * argv[])
const char * inputFilename = argv[1];
const char * outputFilename = argv[2];
- typedef unsigned char InputPixelType;
+ typedef float InputPixelType;
const unsigned int Dimension = 2;
typedef otb::Image<InputPixelType, Dimension> InputImageType;
@@ -55,19 +55,43 @@ int otbLocalHistogramImageFunctionTest(int argc, char * argv[])
index[0] = 100;
index[1] = 100;
- function->SetNeighborhoodRadius(3);
+ function->SetNeighborhoodRadius(10);
function->SetHistogramMin(filter->GetMinimum());
function->SetHistogramMax(filter->GetMaximum());
FunctionType::OutputType Result;
Result = function->EvaluateAtIndex(index);
+ float numberOfPixelsCounted = 0.0;
+
std::ofstream outputStream(outputFilename);
outputStream << std::setprecision(10) << std::endl;
+ outputStream << "Index: " << index << std::endl;
+
+ for(unsigned int i = 0 ; i < function->GetNumberOfHistogramBins() ; ++i)
+ {
+ outputStream << "Pos[" <<i <<"] = " << Result->GetFrequency(i) << " -> " << Result->GetMeasurement(i,0) << std::endl;
+ numberOfPixelsCounted += Result->GetFrequency(i);
+ }
+
+ outputStream << "Number Of Pixels counted: " << numberOfPixelsCounted << std::endl;
+
+ index[0] = 0;
+ index[1] = 0;
+
+ Result = function->EvaluateAtIndex(index);
+
+ numberOfPixelsCounted = 0.0;
+
+ outputStream << "Index: " << index << std::endl;
+
for(unsigned int i = 0 ; i < function->GetNumberOfHistogramBins() ; ++i)
{
outputStream << "Pos[" <<i <<"] = " << Result->GetFrequency(i) << " -> " << Result->GetMeasurement(i,0) << std::endl;
+ numberOfPixelsCounted += Result->GetFrequency(i);
}
+ outputStream << "Number Of Pixels counted: " << numberOfPixelsCounted << std::endl;
+
outputStream.close();
return EXIT_SUCCESS;
diff --git a/Testing/Code/FeatureExtraction/otbMetaImageFunction.cxx b/Testing/Code/FeatureExtraction/otbMetaImageFunction.cxx
index fb5441ee64dcf4bc8085443f7e35c3dc8a9e2d12..633b4882b7d3ae2c319b78367d111a32586cf6fe 100644
--- a/Testing/Code/FeatureExtraction/otbMetaImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbMetaImageFunction.cxx
@@ -23,7 +23,7 @@
#include "otbImage.h"
#include "otbImageFileReader.h"
#include "otbFlusserMomentsImageFunction.h"
-#include "otbImageFunctionAdapter.h"
+#include "otbImageFunctionAdaptor.h"
typedef unsigned short InputPixelType;
const unsigned int Dimension = 2;
@@ -31,7 +31,7 @@ const unsigned int Dimension = 2;
typedef otb::Image<InputPixelType, Dimension> InputImageType;
typedef otb::ImageFileReader<InputImageType> ReaderType;
typedef otb::FlusserMomentsImageFunction<InputImageType> FlusserFunctionType;
-typedef otb::ImageFunctionAdapter<InputImageType,FlusserFunctionType> FunctionType;
+typedef otb::ImageFunctionAdaptor<FlusserFunctionType> FunctionType;
typedef otb::MetaImageFunction<
itk::NumericTraits<InputPixelType>::RealType,double> MetaImageFunctionType;
@@ -61,9 +61,9 @@ int otbMetaImageFunction(int argc, char * argv[])
function2->SetInputImage(reader->GetOutput());
function3->SetInputImage(reader->GetOutput());
- function1->GetImageFunction()->SetNeighborhoodRadius(3);
- function2->GetImageFunction()->SetNeighborhoodRadius(5);
- function3->GetImageFunction()->SetNeighborhoodRadius(7);
+ function1->GetInternalImageFunction()->SetNeighborhoodRadius(3);
+ function2->GetInternalImageFunction()->SetNeighborhoodRadius(5);
+ function3->GetInternalImageFunction()->SetNeighborhoodRadius(7);
std::ofstream outputStream(argv[2]);