From bd72455b82e739f8f7b00177c7b1c00725a50c50 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Mon, 10 Jul 2006 13:15:59 +0000
Subject: [PATCH] =?UTF-8?q?D=C3=A9finit=20le=20M=5FPI=20uniquement=20s'il?=
=?UTF-8?q?=20n'existe=20pas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Code/FeatureExtraction/otbImageToPathListAlignFilter.txx | 6 +++---
.../otbLineCorrelationDetectorImageFilter.txx | 2 ++
Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx | 8 ++++++--
.../FeatureExtraction/otbLineRatioDetectorImageFilter.txx | 2 ++
.../otbPixelSuppressionByDirectionImageFilter.txx | 2 ++
.../FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx | 3 ++-
6 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx b/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
index dd0cee047a..3b2faf981e 100644
--- a/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
+++ b/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
@@ -27,9 +27,9 @@
#include "itkImageLinearConstIteratorWithIndex.h"
#include "itkImageLinearIteratorWithIndex.h"
-#if defined(WIN32) || defined(WIN32CE)
-#define M_PI 3.141592654
-#endif
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
namespace otb
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
index 9f595cc6c3..f9f13e134f 100755
--- a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
@@ -30,7 +30,9 @@
#include "itkProgressReporter.h"
#include <math.h>
+#ifndef M_PI
#define M_PI 3.14159265358979323846
+#endif
namespace otb
{
diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
index cc32540724..2a6e935388 100755
--- a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
+++ b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
@@ -31,7 +31,9 @@
#include <math.h>
#include "otbMacro.h"
+#ifndef M_PI
#define M_PI 3.14159265358979323846
+#endif
namespace otb
{
@@ -314,8 +316,10 @@ void LineDetectorImageFilterBase< TInputImage, TOutputImage, InterpolatorType>
Index[0] = static_cast<CoordRepType>(xout + Xc);
Index[1] = static_cast<CoordRepType>(yout + Yc);
-
- PixelValues[dir][zone].push_back(static_cast<double>(interpolator->EvaluateAtContinuousIndex( Index )));
+//THOMAS
+// PixelValues[dir][zone].push_back(static_cast<double>(interpolator->EvaluateAtContinuousIndex( Index )));
+ double result = static_cast<double>(interpolator->EvaluateAtContinuousIndex( Index ));
+ PixelValues[dir][zone].push_back(result );
}
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
index 8707082780..34ee0caff3 100755
--- a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
@@ -31,7 +31,9 @@
#include "itkProgressReporter.h"
#include <math.h>
+#ifndef M_PI
#define M_PI 3.14159265358979323846
+#endif
namespace otb
{
diff --git a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
index 1f6e90050b..1891ca8313 100755
--- a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
+++ b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
@@ -31,7 +31,9 @@
#include "itkProgressReporter.h"
#include <math.h>
+#ifndef M_PI
#define M_PI 3.14159265358979323846
+#endif
namespace otb
{
diff --git a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
index 78278dc3dd..4701582e37 100755
--- a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
@@ -27,12 +27,13 @@
#include "itkImageRegionIterator.h"
#include "itkNeighborhoodAlgorithm.h"
#include "itkZeroFluxNeumannBoundaryCondition.h"
-//#include "itkOffset.h"
#include "itkProgressReporter.h"
#include <math.h>
#include "otbMacro.h"
+#ifndef M_PI
#define M_PI 3.14159265358979323846
+#endif
namespace otb
{
--
GitLab