1.1 --- a/RadiometricCalibration/Model/otbRadiometricCalibrationModel.h	Fri Jun 26 10:25:54 2009 +0800
     1.2 +++ b/RadiometricCalibration/Model/otbRadiometricCalibrationModel.h	Fri Jun 26 11:09:51 2009 +0800
     1.3 @@ -38,8 +38,8 @@
     1.4  #include "otbLuminanceToReflectanceImageFilter.h"
     1.5  #include "otbReflectanceToSurfaceReflectanceImageFilter.h"
     1.6  #include "otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h"
     1.7 -#include "otbModulusRenderingFunction.h"
     1.8 -#include "otbPhaseRenderingFunction.h"
     1.9 +#include "otbAmplitudeFunctor.h"
    1.10 +#include "otbPhaseFunctor.h"
    1.11  
    1.12  namespace otb
    1.13  {
    1.14 @@ -99,8 +99,10 @@
    1.15    typedef StandardRenderingFunctionType::Pointer         StandardRenderingFunctionPointerType;
    1.16    typedef ObjectList<StandardRenderingFunctionType>      StandardRenderingFunctionListType;
    1.17    typedef StandardRenderingFunctionListType::Pointer     StandardRenderingFunctionListPointerType;
    1.18 -  typedef Function::ModulusRenderingFunction<ImageType::InternalPixelType, RGBPixelType>    ModulusRenderingFunction;
    1.19 -  typedef Function::PhaseRenderingFunction<ImageType::InternalPixelType, RGBPixelType>      PhaseRenderingFunction;
    1.20 +  typedef Function::StandardRenderingFunction<ImageType::PixelType, RGBPixelType,
    1.21 +  otb::Function::AmplitudeFunctor<ImageType::PixelType> >                            ModulusRenderingFunction;
    1.22 +  typedef Function::StandardRenderingFunction<ImageType::PixelType, RGBPixelType,
    1.23 +  otb::Function::PhaseFunctor<ImageType::PixelType> >                                PhaseRenderingFunction;
    1.24  
    1.25    /** Visu */
    1.26    typedef otb::ImageLayerRenderingModel<ViewerImageType> VisuModelType;
    1.27 @@ -116,7 +118,7 @@
    1.28    typedef ImageToLuminanceImageFilterType::Pointer                ImageToLuminanceImageFilterPointerType;
    1.29    typedef LuminanceToReflectanceImageFilter<ImageType,ImageType>  LuminanceToReflectanceImageFilterType;
    1.30    typedef LuminanceToReflectanceImageFilterType::Pointer          LuminanceToReflectanceImageFilterPointerType;
    1.31 -  typedef ReflectanceToSurfaceReflectanceImageFilter<ImageType,ImageType> 
    1.32 +  typedef ReflectanceToSurfaceReflectanceImageFilter<ImageType,ImageType>
    1.33                                                                    ReflectanceToSurfaceReflectanceImageFilterType;
    1.34    typedef ReflectanceToSurfaceReflectanceImageFilterType::Pointer ReflectanceToSurfaceReflectanceImageFilterPointerType;
    1.35