Commit ffb13d45 authored by Emmanuel Christophe's avatar Emmanuel Christophe

ENH: put the wavelet enum in its own namespace

parent 25c54813
......@@ -30,7 +30,7 @@ namespace otb {
/**
* Standart (useless) definition for unknown wavelet
*/
template < MotherWaveletOperatorEnum TMotherWaveletOperator >
template < Wavelet::Wavelet TMotherWaveletOperator >
const char *
WaveletGenerator< TMotherWaveletOperator >
::GetWaveletName () const
......@@ -43,7 +43,7 @@ WaveletGenerator< TMotherWaveletOperator >
return "Unknown";
}
template < MotherWaveletOperatorEnum TMotherWaveletOperator >
template < Wavelet::Wavelet TMotherWaveletOperator >
void
WaveletGenerator< TMotherWaveletOperator >
::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
......@@ -57,7 +57,7 @@ WaveletGenerator< TMotherWaveletOperator >
return vector;
}
template < MotherWaveletOperatorEnum TMotherWaveletOperator >
template < Wavelet::Wavelet TMotherWaveletOperator >
void
WaveletGenerator< TMotherWaveletOperator >
::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
......@@ -75,7 +75,7 @@ WaveletGenerator< TMotherWaveletOperator >
* Template specialization for the Haar wavelet
*/
template <>
const char * WaveletGenerator<HAAR>::GetWaveletName () const
const char * WaveletGenerator<Wavelet::HAAR>::GetWaveletName () const
{
static const std::string waveletName ( "Haar" );
return waveletName.c_str();
......@@ -83,7 +83,7 @@ const char * WaveletGenerator<HAAR>::GetWaveletName () const
template <>
void
WaveletGenerator<HAAR>
WaveletGenerator<Wavelet::HAAR>
::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
{
static const double sqrt2 = ::vcl_sqrt( 2.0 );
......@@ -99,7 +99,7 @@ WaveletGenerator<HAAR>
template <>
void
WaveletGenerator<HAAR>
WaveletGenerator<Wavelet::HAAR>
::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
{
static const double sqrt2 = ::vcl_sqrt( 2.0 );
......@@ -117,7 +117,7 @@ WaveletGenerator<HAAR>
* Template specialization for the Daubechies 4 wavelet
*/
template <>
const char * WaveletGenerator<DAUBECHIES4>::GetWaveletName () const
const char * WaveletGenerator<Wavelet::DAUBECHIES4>::GetWaveletName () const
{
static const std::string waveletName ( "Daubechies_4" );
return waveletName.c_str();
......@@ -125,7 +125,7 @@ const char * WaveletGenerator<DAUBECHIES4>::GetWaveletName () const
template <>
void
WaveletGenerator<DAUBECHIES4>
WaveletGenerator<Wavelet::DAUBECHIES4>
::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
{
static const double sqrt2 = ::vcl_sqrt(2.);
......@@ -141,7 +141,7 @@ WaveletGenerator<DAUBECHIES4>
template <>
void
WaveletGenerator<DAUBECHIES4>
WaveletGenerator<Wavelet::DAUBECHIES4>
::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
{
static const double sqrt2 = ::vcl_sqrt(2.);
......@@ -159,7 +159,7 @@ WaveletGenerator<DAUBECHIES4>
* Template specialization for the Daubechies 6 tap wavelet
*/
template <>
const char * WaveletGenerator<DAUBECHIES6>::GetWaveletName () const
const char * WaveletGenerator<Wavelet::DAUBECHIES6>::GetWaveletName () const
{
static const std::string waveletName ( "Daubechies_6" );
return waveletName.c_str();
......@@ -167,7 +167,7 @@ const char * WaveletGenerator<DAUBECHIES6>::GetWaveletName () const
template <>
void
WaveletGenerator<DAUBECHIES6>
WaveletGenerator<Wavelet::DAUBECHIES6>
::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
{
coeff.push_back( 0. );
......@@ -182,7 +182,7 @@ WaveletGenerator<DAUBECHIES6>
template <>
void
WaveletGenerator<DAUBECHIES6>
WaveletGenerator<Wavelet::DAUBECHIES6>
::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
{
coeff.push_back( 0. );
......@@ -199,7 +199,7 @@ WaveletGenerator<DAUBECHIES6>
* Template specialization for the Daubechies 8 wavelet
*/
template <>
const char * WaveletGenerator<DAUBECHIES8>::GetWaveletName () const
const char * WaveletGenerator<Wavelet::DAUBECHIES8>::GetWaveletName () const
{
static const std::string waveletName ( "Daubechies_8" );
return waveletName.c_str();
......@@ -207,7 +207,7 @@ const char * WaveletGenerator<DAUBECHIES8>::GetWaveletName () const
template <>
void
WaveletGenerator<DAUBECHIES8>
WaveletGenerator<Wavelet::DAUBECHIES8>
::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
{
coeff.push_back( 0. );
......@@ -224,7 +224,7 @@ WaveletGenerator<DAUBECHIES8>
template <>
void
WaveletGenerator<DAUBECHIES8>
WaveletGenerator<Wavelet::DAUBECHIES8>
::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
{
coeff.push_back( 0. );
......@@ -243,7 +243,7 @@ WaveletGenerator<DAUBECHIES8>
* Template specialization for the Daubechies 12 tap wavelet
*/
template <>
const char * WaveletGenerator<DAUBECHIES12>::GetWaveletName () const
const char * WaveletGenerator<Wavelet::DAUBECHIES12>::GetWaveletName () const
{
static const std::string waveletName ( "Daubechies_12" );
return waveletName.c_str();
......@@ -251,7 +251,7 @@ const char * WaveletGenerator<DAUBECHIES12>::GetWaveletName () const
template <>
void
WaveletGenerator<DAUBECHIES12>
WaveletGenerator<Wavelet::DAUBECHIES12>
::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
{
coeff.push_back( 0. );
......@@ -272,7 +272,7 @@ WaveletGenerator<DAUBECHIES12>
template <>
void
WaveletGenerator<DAUBECHIES12>
WaveletGenerator<Wavelet::DAUBECHIES12>
::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
{
coeff.push_back( 0. );
......@@ -295,7 +295,7 @@ WaveletGenerator<DAUBECHIES12>
* Template specialization for the Daubechies 20 tap wavelet
*/
template <>
const char * WaveletGenerator<DAUBECHIES20>::GetWaveletName () const
const char * WaveletGenerator<Wavelet::DAUBECHIES20>::GetWaveletName () const
{
static const std::string waveletName ( "Daubechies_20" );
return waveletName.c_str();
......@@ -303,7 +303,7 @@ const char * WaveletGenerator<DAUBECHIES20>::GetWaveletName () const
template <>
void
WaveletGenerator<DAUBECHIES20>
WaveletGenerator<Wavelet::DAUBECHIES20>
::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
{
coeff.push_back( 0. );
......@@ -332,7 +332,7 @@ WaveletGenerator<DAUBECHIES20>
template <>
void
WaveletGenerator<DAUBECHIES20>
WaveletGenerator<Wavelet::DAUBECHIES20>
::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
{
coeff.push_back( 0. );
......@@ -368,7 +368,7 @@ WaveletGenerator<DAUBECHIES20>
* vol 1(2), pp:205-220, April 1992
*/
template <>
const char * WaveletGenerator<SPLINE_BIORTHOGONAL_2_4>::GetWaveletName () const
const char * WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_2_4>::GetWaveletName () const
{
static const std::string waveletName ( "SplineBiorthoonal_2_4" );
return waveletName.c_str();
......@@ -376,7 +376,7 @@ const char * WaveletGenerator<SPLINE_BIORTHOGONAL_2_4>::GetWaveletName () const
template <>
void
WaveletGenerator<SPLINE_BIORTHOGONAL_2_4>
WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_2_4>
::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
{
static const double sqrt2 = ::vcl_sqrt( 2.0 );
......@@ -396,7 +396,7 @@ WaveletGenerator<SPLINE_BIORTHOGONAL_2_4>
template <>
void
WaveletGenerator<SPLINE_BIORTHOGONAL_2_4>
WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_2_4>
::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
{
static const double sqrt2 = ::vcl_sqrt( 2.0 );
......@@ -423,7 +423,7 @@ WaveletGenerator<SPLINE_BIORTHOGONAL_2_4>
* Also known as 7/9 filter.
*/
template <>
const char * WaveletGenerator<SPLINE_BIORTHOGONAL_4_4>::GetWaveletName () const
const char * WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_4_4>::GetWaveletName () const
{
static const std::string waveletName ( "SplineBiorthoonal_4_4" );
return waveletName.c_str();
......@@ -431,7 +431,7 @@ const char * WaveletGenerator<SPLINE_BIORTHOGONAL_4_4>::GetWaveletName () const
template <>
void
WaveletGenerator<SPLINE_BIORTHOGONAL_4_4>
WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_4_4>
::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
{
static const double sqrt2 = ::vcl_sqrt( 2.0 );
......@@ -450,7 +450,7 @@ WaveletGenerator<SPLINE_BIORTHOGONAL_4_4>
template <>
void
WaveletGenerator<SPLINE_BIORTHOGONAL_4_4>
WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_4_4>
::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
{
static const double sqrt2 = ::vcl_sqrt( 2.0 );
......@@ -471,7 +471,7 @@ WaveletGenerator<SPLINE_BIORTHOGONAL_4_4>
* Template specialization for the Symlet 8 tap orthogonal wavelet
*/
template <>
const char * WaveletGenerator<SYMLET8>::GetWaveletName () const
const char * WaveletGenerator<Wavelet::SYMLET8>::GetWaveletName () const
{
static const std::string waveletName ( "Symlet_8" );
return waveletName.c_str();
......@@ -479,7 +479,7 @@ const char * WaveletGenerator<SYMLET8>::GetWaveletName () const
template <>
void
WaveletGenerator<SYMLET8>
WaveletGenerator<Wavelet::SYMLET8>
::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
{
coeff.push_back( 0. );
......@@ -496,7 +496,7 @@ WaveletGenerator<SYMLET8>
template <>
void
WaveletGenerator<SYMLET8>
WaveletGenerator<Wavelet::SYMLET8>
::GetHighPassCoefficientVector( CoefficientVector & coeff ) const
{
coeff.push_back( 0. );
......@@ -515,15 +515,15 @@ WaveletGenerator<SYMLET8>
* Forcing instantiation
*/
template class WaveletGenerator< HAAR >;
template class WaveletGenerator< DB4 >;
template class WaveletGenerator< DB6 >;
template class WaveletGenerator< DB8 >;
template class WaveletGenerator< DB12 >;
template class WaveletGenerator< DB20 >;
template class WaveletGenerator< SPLINE_BIORTHOGONAL_2_4 >;
template class WaveletGenerator< SPLINE_BIORTHOGONAL_4_4 >;
template class WaveletGenerator< SYMLET8 >;
template class WaveletGenerator< Wavelet::HAAR >;
template class WaveletGenerator< Wavelet::DB4 >;
template class WaveletGenerator< Wavelet::DB6 >;
template class WaveletGenerator< Wavelet::DB8 >;
template class WaveletGenerator< Wavelet::DB12 >;
template class WaveletGenerator< Wavelet::DB20 >;
template class WaveletGenerator< Wavelet::SPLINE_BIORTHOGONAL_2_4 >;
template class WaveletGenerator< Wavelet::SPLINE_BIORTHOGONAL_4_4 >;
template class WaveletGenerator< Wavelet::SYMLET8 >;
} // end of namespace otb
......
......@@ -26,9 +26,12 @@
#include "itkLightObject.h"
#include "itkObjectFactory.h"
namespace otb {
namespace otb
{
typedef enum {
namespace Wavelet
{
enum Wavelet{
HAAR = 0,
DAUBECHIES4 = 1, DB4 = 1,
DAUBECHIES6 = 2, DB6 = 2,
......@@ -39,7 +42,8 @@ typedef enum {
SPLINE_BIORTHOGONAL_4_4, // 7
SYMLET8, // 8
TotalNumberOfDefinedMotherWavelets
} MotherWaveletOperatorEnum;
};
}
/** \class WaveletGenerator
* \brief Wavelet coefficient definition
......@@ -49,11 +53,11 @@ typedef enum {
* Society for Industrial and Applied Mathematics, 1992.
*
* The class is templated with the wavelet ID from the
* MotherWaveletOperatorEnum type. The members throw an
* Wavelet::Wavelet type. The members throw an
* exception if the template specialisation is not defined
* according to the wavelet ID.
*/
template < MotherWaveletOperatorEnum TMotherWaveletOperator >
template < Wavelet::Wavelet TMotherWaveletOperator >
class ITK_EXPORT WaveletGenerator
: public itk::LightObject
{
......
......@@ -35,7 +35,7 @@ namespace otb {
* \sa WaveletOperator
* \sa WaveletGenerator
*/
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
Wavelet::WaveletDirection TDirectionOfTransformation,
class TPixel, unsigned int VDimension,
class TAllocator = itk::NeighborhoodAllocator< TPixel > >
......
......@@ -34,7 +34,7 @@ namespace otb {
* \sa WaveletOperatorBase
* \sa WaveletGenerator
*/
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
Wavelet::WaveletDirection TDirectionOfTransformation,
class TPixel, unsigned int VDimension,
class TAllocator = itk::NeighborhoodAllocator< TPixel > >
......
......@@ -23,7 +23,7 @@
#include "itkExceptionObject.h"
#include "itkNeighborhoodOperator.h"
// This include is needed here to define MotherWaveletOperatorEnum...
// This include is needed here to define Wavelet::Wavelet...
#include "otbWaveletGenerator.h"
#include "otbWaveletLowPassOperator.h"
......@@ -46,7 +46,7 @@ namespace otb {
* \sa WaveletLowPassOperator
* \sa WaveletHighPassOperator
*/
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
Wavelet::WaveletDirection TDirectionOfTransformation,
class TPixel, unsigned int VDimension,
class TAllocator = itk::NeighborhoodAllocator< TPixel > >
......
......@@ -64,7 +64,7 @@ namespace Wavelet
*
* \ingroup Operators
*/
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
class TPixel, unsigned int VDimension,
class TAllocator = itk::NeighborhoodAllocator< TPixel > >
class ITK_EXPORT WaveletOperatorBase
......@@ -78,7 +78,7 @@ public:
itkTypeMacro(WaveletOperatorBase,NeighborhoodOperator);
typedef typename Superclass::SizeType SizeType;
typedef MotherWaveletOperatorEnum MotherWaveletOperatorEnumType;
typedef Wavelet::Wavelet MotherWaveletOperatorEnumType;
itkStaticConstMacro( MotherWaveletOperator, MotherWaveletOperatorEnumType, TMotherWaveletOperator );
/** Construction */
......
......@@ -24,7 +24,7 @@
namespace otb {
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
......@@ -44,7 +44,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
}
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
......@@ -69,7 +69,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
coeff = upSampledCoeff;
}
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
......@@ -89,7 +89,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
coeff = newCoeff;
}
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
......@@ -120,7 +120,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
}
}
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
......@@ -147,7 +147,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
}
}
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
......@@ -174,7 +174,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
}
}
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
template < Wavelet::Wavelet TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
......
......@@ -44,8 +44,8 @@ int otbWaveletFilterBank( int argc, char * argv[] )
reader->SetFileName( inputFileName );
/* Wavelet choice */
//const otb::MotherWaveletOperatorEnum wvltID = otb::HAAR;
const otb::MotherWaveletOperatorEnum wvltID = otb::SYMLET8;
//const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SYMLET8;
/* Forward Transformation */
typedef otb::WaveletOperator< wvltID, otb::Wavelet::FORWARD, PixelType, Dimension > WaveletOperator;
......
......@@ -27,8 +27,8 @@ int otbWaveletFilterBankNew(int argc, char * argv[])
typedef otb::Image< PixelType, Dimension > ImageType;
/* Wavelet choice */
//const otb::MotherWaveletOperatorEnum wvltID = otb::HAAR;
const otb::MotherWaveletOperatorEnum wvltID = otb::DB4;
//const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::DB4;
typedef otb::WaveletOperator< wvltID, otb::Wavelet::FORWARD, PixelType, Dimension > WaveletOperator;
typedef otb::WaveletFilterBank< ImageType, ImageType, WaveletOperator, otb::Wavelet::FORWARD >
......
......@@ -27,8 +27,8 @@ int otbWaveletInverseFilterBankNew(int argc, char * argv[])
typedef otb::Image< PixelType, Dimension > ImageType;
/* Wavelet choice */
//const otb::MotherWaveletOperatorEnum wvltID = otb::HAAR;
const otb::MotherWaveletOperatorEnum wvltID = otb::SYMLET8;
//const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SYMLET8;
/* Inverse Transformation */
typedef otb::WaveletOperator< wvltID, otb::Wavelet::INVERSE, PixelType, Dimension > WaveletOperator;
......
......@@ -30,7 +30,7 @@ int otbWaveletInverseTransformNew(int argc, char * argv[])
typedef otb::Image< PixelType, Dimension > ImageType;
/* Wavelet choice */
const otb::MotherWaveletOperatorEnum wvltID = otb::SYMLET8;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SYMLET8;
/* Inverse Transformation */
typedef otb::WaveletOperator< wvltID, otb::Wavelet::INVERSE, PixelType, Dimension >
......
......@@ -23,7 +23,7 @@
int otbWaveletOperator(int argc, char * argv[])
{
const otb::Wavelet::WaveletDirection directionID = otb::Wavelet::FORWARD;
const otb::MotherWaveletOperatorEnum wvltID = otb::HAAR;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
const int Dimension = 2;
typedef double PixelType;
......
......@@ -23,7 +23,7 @@
int otbWaveletOperatorNew(int argc, char * argv[])
{
const otb::Wavelet::WaveletDirection directionID = otb::Wavelet::INVERSE;
const otb::MotherWaveletOperatorEnum wvltID = otb::SPLINE_BIORTHOGONAL_4_4;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SPLINE_BIORTHOGONAL_4_4;
const int Dimension = 2;
typedef double PixelType;
......
......@@ -31,8 +31,8 @@ int otbWaveletPacketInverseTransformNew(int argc, char * argv[])
typedef otb::Image< PixelType, Dimension > ImageType;
/* Wavelet choice */
//const otb::MotherWaveletOperatorEnum wvltID = otb::HAAR;
const otb::MotherWaveletOperatorEnum wvltID = otb::DB8;
//const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::DB8;
/* Inverse Transformation */
typedef otb::WaveletOperator< wvltID, otb::Wavelet::INVERSE, PixelType, Dimension >
......
......@@ -47,8 +47,8 @@ int otbWaveletPacketTransform( int argc, char * argv[] )
reader->SetFileName( inputFileName );
/* Wavelet choice */
const otb::MotherWaveletOperatorEnum wvltID = otb::HAAR;
// const otb::MotherWaveletOperatorEnum wvltID = otb::SYMLET8;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
// const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SYMLET8;
/* Wavelet packet configuration */
typedef otb::FullyDecomposedWaveletPacketCost< ImageType > CostType;
......
......@@ -29,8 +29,8 @@ int otbWaveletPacketTransformNew(int argc, char * argv[])
typedef otb::Image< PixelType, Dimension > ImageType;
/* Wavelet choice */
const otb::MotherWaveletOperatorEnum wvltID = otb::HAAR;
// const otb::MotherWaveletOperatorEnum wvltID = otb::SYMLET8;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
// const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SYMLET8;
/* Wavelet packet configuration */
typedef otb::FullyDecomposedWaveletPacketCost< ImageType > CostType;
......
......@@ -47,7 +47,7 @@ int otbWaveletTransform( int argc, char * argv[] )
reader->SetFileName( inputFileName );
/* Wavelet choice */
const otb::MotherWaveletOperatorEnum wvltID = otb::HAAR;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::HAAR;
/* Forward Transformation */
typedef otb::WaveletOperator< wvltID, otb::Wavelet::FORWARD, PixelType, Dimension >
......
......@@ -28,7 +28,7 @@ int otbWaveletTransformNew(int argc, char * argv[])
typedef otb::Image< PixelType, Dimension > ImageType;
/* Wavelet choice */
const otb::MotherWaveletOperatorEnum wvltID = otb::SYMLET8;
const otb::Wavelet::Wavelet wvltID = otb::Wavelet::SYMLET8;
/* Forward Transformation */
typedef otb::WaveletOperator< wvltID, otb::Wavelet::FORWARD, PixelType, Dimension > WaveletOperator;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment