From cc3f256ccb543af347cb5186a70bf151b1777534 Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Fri, 3 Nov 2017 10:39:20 +0100
Subject: [PATCH] WRG : change method's signature to avoid wargning at
compilation on windows
---
.../include/otbStreamingWarpImageFilter.h | 2 +-
.../include/otbStreamingWarpImageFilter.txx | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
index dac5c68e87..97a32a5701 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
@@ -89,7 +89,7 @@ public:
return m_OutputSignedSpacing;
};
- void SetOutputSpacing( SpacingType OutputSpacing ) override ;
+ void SetOutputSpacing( const SpacingType OutputSpacing ) override ;
void SetOutputSpacing( const double *values ) override ;
protected:
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.txx b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.txx
index c3e9e27f68..1d9bf6e7bc 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.txx
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.txx
@@ -44,25 +44,27 @@ StreamingWarpImageFilter<TInputImage, TOutputImage, TDisplacementField>
template<class TInputImage, class TOutputImage, class TDisplacementField>
void
StreamingWarpImageFilter<TInputImage, TOutputImage, TDisplacementField>
-::SetOutputSpacing( SpacingType outputSpacing )
+::SetOutputSpacing( const SpacingType outputSpacing )
{
m_OutputSignedSpacing = outputSpacing;
- typename TInputImage::DirectionType direction = this->GetOutput()->GetDirection();
- for(unsigned int i = 0; i < TInputImage::ImageDimension; ++i)
+ SpacingType spacing = outputSpacing;
+ typename TInputImage::DirectionType direction =
+ this->GetOutput()->GetDirection();
+ for( unsigned int i = 0 ; i < TInputImage::ImageDimension ; ++i )
{
- if ( outputSpacing[i] < 0 )
+ if ( spacing[i] < 0 )
{
if ( direction[i][i] > 0 )
{
- for(unsigned int j = 0; j < TInputImage::ImageDimension; ++j)
+ for( unsigned int j = 0 ; j < TInputImage::ImageDimension ; ++j )
{
direction[j][i] = - direction[j][i];
}
}
- outputSpacing[i] = - outputSpacing[i];
+ spacing[i] = - spacing[i];
}
}
- this->Superclass::SetOutputSpacing( outputSpacing );
+ this->Superclass::SetOutputSpacing( spacing );
this->Superclass::SetOutputDirection( direction );
this->Modified();
}
--
GitLab