From 907cb3a12b2936efef28d2bec351314ab31a43ab Mon Sep 17 00:00:00 2001
From: Otmane Lahlou <otmane.lahlou@c-s.fr>
Date: Tue, 9 Nov 2010 18:28:43 +0100
Subject: [PATCH] ENH : replace ImageAdapter with ImageAdaptor

---
 .../ObjectDetection/otbDescriptorsListSampleGenerator.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx b/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
index 2ee817950c..345ae8ef76 100644
--- a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
+++ b/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
@@ -30,7 +30,7 @@
 #include "otbDescriptorsListSampleGenerator.h"
 #include "otbImageFileReader.h"
 #include "otbVectorDataFileReader.h"
-#include "otbImageFunctionAdapter.h"
+#include "otbImageFunctionAdaptor.h"
 
 const unsigned int Dimension = 2;
 typedef int        LabelType;
@@ -41,8 +41,8 @@ typedef double     CoordRepType;
 typedef otb::Image<PixelType, Dimension>                              ImageType;
 typedef otb::VectorData<>                                             VectorDataType;
 typedef otb::RadiometricMomentsImageFunction<ImageType, CoordRepType> FunctionType;
-  typedef otb::ImageFunctionAdapter
-    <ImageType,FunctionType>                                          AdapatedFunctionType;
+  typedef otb::ImageFunctionAdaptor
+    <FunctionType>                                          AdapatedFunctionType;
 
 //typedef FunctionType::OutputType                      SampleType;
 typedef itk::VariableLengthVector<CoordRepType>         SampleType;
@@ -134,7 +134,7 @@ int otbDescriptorsListSampleGenerator(int argc, char* argv[])
 
   AdapatedFunctionType::Pointer descriptorsFunction = AdapatedFunctionType::New();
   descriptorsFunction->SetInputImage(imageReader->GetOutput());
-  descriptorsFunction->GetImageFunction()->SetNeighborhoodRadius(5);
+  descriptorsFunction->GetInternalImageFunction()->SetNeighborhoodRadius(5);
 
   DescriptorsListSampleGeneratorType::Pointer descriptorsGenerator = DescriptorsListSampleGeneratorType::New();
   descriptorsGenerator->SetInputImage(imageReader->GetOutput());
-- 
GitLab