Commit e550457d authored by Cyrille Valladeau's avatar Cyrille Valladeau

ERR : correct pb of compilation on windows

parent df6928d1
......@@ -172,7 +172,7 @@ private:
void operator=(const Self&); //purposely not implemented
/** Compute correlation from offset */
inline double Correlation(const NeighborhoodType & fixed, const NeighborhoodType & moving, const OffsetType & offset, unsigned int scale) const;
inline double Correlation(const NeighborhoodType & fixed, const NeighborhoodType & moving, const OffsetType & offset, unsigned int scale=1) const;
/** Refine the location of the correlation maximum */
inline double RefineLocation(const NeighborhoodType & correlMap,const OffsetType & maxPos, DeformationValueType & value) const;
......
......@@ -25,6 +25,7 @@
#include "itkProgressReporter.h"
#include "itkLinearInterpolateImageFunction.h"
#include "itkImageRegionIteratorWithIndex.h"
#include <algorithm>
namespace otb
{
......@@ -188,7 +189,7 @@ FineCorrelationImageFilter<TInputImage,TOutputCorrelation,TOutputDeformationFiel
template <class TInputImage, class TOutputCorrelation, class TOutputDeformationField>
inline double
FineCorrelationImageFilter<TInputImage,TOutputCorrelation,TOutputDeformationField>
::Correlation(const NeighborhoodType & fixed, const NeighborhoodType & moving, const OffsetType & offset, unsigned int scale = 1) const
::Correlation(const NeighborhoodType & fixed, const NeighborhoodType & moving, const OffsetType & offset, unsigned int scale) const
{
double crossProductSum = 0;
double fSquareSum = 0;
......@@ -341,7 +342,7 @@ FineCorrelationImageFilter<TInputImage,TOutputCorrelation,TOutputDeformationFiel
{
invert = mat.GetInverse();
}
catch( itk::ExceptionObject & err )
catch( itk::ExceptionObject & )
{
// Matrix is not invertible
value[0]=maxPos[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment