From 020b10acdd11d3dd6f17c676bb5de04efd35cfbc Mon Sep 17 00:00:00 2001
From: Patrick Imbo <patrick.imbo@c-s.fr>
Date: Wed, 22 Mar 2006 14:27:27 +0000
Subject: [PATCH] Moments complexe avec Path
---
Code/FeatureExtraction/otbGeometricMomentPathFunction.h | 4 ++--
Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Code/FeatureExtraction/otbGeometricMomentPathFunction.h b/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
index a2250d0a52..01b4a9164c 100644
--- a/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
@@ -6,7 +6,7 @@
Date : 22 mars 2006
Version :
Role : Geometric Moments Class of path
- $Id:$
+ $Id$
=========================================================================*/
#ifndef _otbGeometricMomentPathFunction_h
@@ -30,7 +30,7 @@ template < class TInputImage,
class TOutput = float,
class TCoordRep = float >
class ITK_EXPORT GeometricMomentPathFunction :
- public itk::ImageFunction<TInputImage , TInputPath, TOutput, TCoordRep >
+ public PathFunction<TInputImage , TInputPath, TOutput, TCoordRep >
{
public:
/** Standard class typedefs. */
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx
index 038b2a7775..2b15da896b 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx
@@ -35,9 +35,9 @@ int otbComplexMomentPath( int argc, char ** argv )
typedef InputImageType::PointType ImagePointType;
typedef otb::ImageFileReader< InputImageType > ReaderType;
- typedef itk::PolyLineParametricPath< Dimension > PathType;
- typedef std::complex<double> ComplexType
- typedef otb::ComplexMomentPathFunction<InputImageType,PathType,ComplexType> CMType;
+ typedef itk::PolyLineParametricPath< Dimension > PathType;
+ typedef otb::ComplexMomentPathFunction<InputImageType,PathType> CMType;
+ typedef typename CMType::ComplexType ComplexType;
ReaderType::Pointer reader = ReaderType::New();
reader->SetFileName( inputFilename );
--
GitLab