From 3374664a3447db6ec00392ecc82799b8cd0c9012 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@c-s.fr>
Date: Fri, 19 Oct 2007 14:16:50 +0000
Subject: [PATCH] Tentative de correction du pb de compil sous visual.
---
Code/Projections/otbMapProjection.h | 8 +++++---
Code/Projections/otbMapProjection.txx | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Code/Projections/otbMapProjection.h b/Code/Projections/otbMapProjection.h
index 788fbe1d9a..e532a5aa93 100644
--- a/Code/Projections/otbMapProjection.h
+++ b/Code/Projections/otbMapProjection.h
@@ -64,17 +64,19 @@ public :
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef TOssimMapProjection OssimMapProjectionType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef TOssimMapProjection OssimMapProjectionType;
typedef itk::Point<ScalarType,NInputDimensions > InputPointType;
typedef itk::Point<ScalarType,NOutputDimensions > OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+itkNewMacro( Self );
/** Run-time type information (and related methods). */
itkTypeMacro( MapProjection, Transform );
+
+ itkStaticConstMacro(DirectionOfMapping,InverseOrForwardTransformationEnum,transform);
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
diff --git a/Code/Projections/otbMapProjection.txx b/Code/Projections/otbMapProjection.txx
index 140a84e570..cb6384661e 100644
--- a/Code/Projections/otbMapProjection.txx
+++ b/Code/Projections/otbMapProjection.txx
@@ -136,7 +136,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi
{
OutputPointType outputPoint;
- if (Transform == INVERSE)
+ if (DirectionOfMapping == INVERSE)
{
//On transforme le type "itk::point" en type "ossim::ossimDpt"
ossimDpt ossimDPoint(point[0], point[1]);
@@ -148,7 +148,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi
outputPoint[0]=ossimGPoint.lat;
outputPoint[1]=ossimGPoint.lon;
}
- else if (Transform == FORWARD)
+ else if (DirectionOfMapping == FORWARD)
{
//On transforme le type "itk::point" en type "ossim::ossimGpt"
ossimGpt ossimGPoint(point[0], point[1]);
--
GitLab