From d5b533561daba1f2200e1fcb215828c6c77e8b5e Mon Sep 17 00:00:00 2001
From: Julie Brossard <julie.brossard@c-s.fr>
Date: Fri, 21 Aug 2020 09:44:50 +0200
Subject: [PATCH] Revert "BUG: Fixed Monteverdi compilation error"
This reverts commit b3c3a1839a6e981923960b37d945611b3cf446b3.
---
.mailmap | 1 +
.../Core/Common/include/otbImageRegionAdaptativeSplitter.h | 2 +-
.../Transform/include/otbImageToGenericRSOutputParameters.h | 6 +++---
Modules/Filtering/Contrast/include/otbApplyGainFilter.h | 4 ++--
.../Contrast/include/otbCLHistogramEqualizationFilter.h | 2 +-
Modules/Filtering/Contrast/include/otbComputeHistoFilter.h | 2 +-
Modules/Filtering/DEM/include/otbDEMToImageGenerator.h | 6 +++---
.../Filtering/Smoothing/include/otbFastNLMeansImageFilter.h | 4 ++--
.../include/otbListSampleToHistogramListGenerator.h | 2 +-
.../otbListSampleToVariableDimensionHistogramGenerator.h | 2 +-
.../DimensionalityReductionLearning/include/otbSOMModel.h | 4 ++--
.../Registration/Stereo/include/otbMulti3DMapToDEMFilter.h | 6 +++---
.../Conversion/include/otbPersistentImageToOGRDataFilter.h | 2 +-
.../Conversion/include/otbVectorDataToLabelImageFilter.h | 6 +++---
.../Conversion/include/otbVectorDataToLabelMapFilter.h | 6 +++---
.../include/otbVectorDataToLabelMapWithAttributesFilter.h | 6 +++---
.../include/otbOGRLayerStreamStitchingFilter.h | 2 +-
17 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/.mailmap b/.mailmap
index 646d37da89..ddb74cbf38 100644
--- a/.mailmap
+++ b/.mailmap
@@ -48,6 +48,7 @@ Jonathan Guinet <jonathan.guinet@c-s.fr>
Jordi Inglada <jordi.inglada@cesbio.eu>
Jordi Inglada <jordi.inglada@cesbio.eu> Jordi Inglada <jordi.inglada@cesbio.cnes.fr>
Jordi Inglada <jordi.inglada@cesbio.eu> Jordi Inglada <jordi.inglada@orfeo-toolbox.org>
+Julie Brossard <julie.brossard@c-s.fr>
Julien Malik <julien.malik@c-s.fr>
Julien Malik <julien.malik@c-s.fr> Julien Malik <julien.malik@gmail.com>
Julien Malik <julien.malik@c-s.fr> Julien Malik <julien.malik@orfeo-toolbox.org>
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
index e170b7d92c..6fa3d81f69 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
@@ -158,7 +158,7 @@ private:
void operator=(const ImageRegionAdaptativeSplitter&) = delete;
// This reflects the input image tiling
- SizeType m_TileHint;
+ SizeType m_TileHint{0,0};
// This contains the ImageRegion that is currently being split
RegionType m_ImageRegion;
diff --git a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
index e1d73b7311..9a8ea947b0 100644
--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
+++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
@@ -180,9 +180,9 @@ private:
void EstimateOutputOrigin();
typename ImageType::ConstPointer m_Input;
- PointType m_OutputOrigin;
- SpacingType m_OutputSpacing;
- SizeType m_OutputSize;
+ PointType m_OutputOrigin{0.0};
+ SpacingType m_OutputSpacing{0.0};
+ SizeType m_OutputSize{0,0};
OutputImageExtentType m_OutputExtent;
GenericRSTransformPointerType m_Transform;
diff --git a/Modules/Filtering/Contrast/include/otbApplyGainFilter.h b/Modules/Filtering/Contrast/include/otbApplyGainFilter.h
index d50896bd2a..3f47473c72 100644
--- a/Modules/Filtering/Contrast/include/otbApplyGainFilter.h
+++ b/Modules/Filtering/Contrast/include/otbApplyGainFilter.h
@@ -127,8 +127,8 @@ private:
bool m_NoDataFlag;
bool m_ThumbSizeFromSpacing;
double m_Step;
- typename LutType::SizeType m_LutSize;
- typename InputImageType::SizeType m_ThumbSize;
+ typename LutType::SizeType m_LutSize{0,0};
+ typename InputImageType::SizeType m_ThumbSize{0,0};
};
} // End namespace otb
diff --git a/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h b/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h
index 828881b42f..de693340f5 100644
--- a/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h
+++ b/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h
@@ -167,7 +167,7 @@ private:
typename BufferFilter::Pointer m_BufferFilter;
InputPixelType m_Min, m_Max, m_NoData;
unsigned long m_NbBin;
- typename InputImageType::SizeType m_ThumbSize;
+ typename InputImageType::SizeType m_ThumbSize{0,0};
double m_Threshold;
bool m_NoDataFlag;
};
diff --git a/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h b/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h
index bf87187813..2aad4da50c 100644
--- a/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h
+++ b/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h
@@ -135,7 +135,7 @@ private:
InputPixelType m_Min;
InputPixelType m_Max;
InputPixelType m_NoData;
- SizeType m_ThumbSize;
+ SizeType m_ThumbSize{0,0};
bool m_NoDataFlag;
double m_Step;
float m_Threshold;
diff --git a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
index 695e25f14e..bf77133120 100644
--- a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
+++ b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
@@ -186,9 +186,9 @@ protected:
void GenerateOutputInformation() override;
DEMHandlerType::Pointer m_DEMHandler;
- PointType m_OutputOrigin;
- SpacingType m_OutputSpacing;
- SizeType m_OutputSize;
+ PointType m_OutputOrigin{0.0};
+ SpacingType m_OutputSpacing{0.0};
+ SizeType m_OutputSize{0,0};
PixelType m_DefaultUnknownValue;
bool m_AboveEllipsoid;
diff --git a/Modules/Filtering/Smoothing/include/otbFastNLMeansImageFilter.h b/Modules/Filtering/Smoothing/include/otbFastNLMeansImageFilter.h
index 09d5d1c2f8..60b161d6f8 100644
--- a/Modules/Filtering/Smoothing/include/otbFastNLMeansImageFilter.h
+++ b/Modules/Filtering/Smoothing/include/otbFastNLMeansImageFilter.h
@@ -146,8 +146,8 @@ private:
) const;
// Define class attributes
- InSizeType m_HalfSearchSize;
- InSizeType m_HalfPatchSize;
+ InSizeType m_HalfSearchSize{0,0};
+ InSizeType m_HalfPatchSize{0,0};
float m_Var;
float m_CutoffDistance;
float m_NormalizeDistance; // cutoff**2 * windowSize**2
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
index 7b388dbcdd..2d7adf2b06 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
@@ -158,7 +158,7 @@ protected:
private:
// ListSampleConstPointerType m_List;
- HistogramSizeType m_Size;
+ HistogramSizeType m_Size{0,0};
float m_MarginalScale;
MeasurementVectorType m_HistogramMin;
MeasurementVectorType m_HistogramMax;
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
index 7707e3dfde..77c9d1f188 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
@@ -120,7 +120,7 @@ protected:
using Superclass::MakeOutput;
private:
- HistogramSizeType m_Sizes;
+ HistogramSizeType m_Sizes{0,0};
float m_MarginalScale;
MeasurementVectorType m_HistogramMin;
MeasurementVectorType m_HistogramMax;
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
index 27d430829a..86e7ed2ac2 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
@@ -112,7 +112,7 @@ private:
virtual TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType* quality = nullptr, ProbaSampleType* proba = nullptr) const override;
/** Map size (width, height) */
- SizeType m_MapSize;
+ SizeType m_MapSize{0,0};
/** Number of iterations */
unsigned int m_NumberOfIterations;
/** Initial learning coefficient */
@@ -120,7 +120,7 @@ private:
/** Final learning coefficient */
double m_BetaEnd;
/** Initial neighborhood size */
- SizeType m_NeighborhoodSizeInit;
+ SizeType m_NeighborhoodSizeInit{0,0};
/** Minimum initial neuron weights */
InputValueType m_MinWeight;
/** Maximum initial neuron weights */
diff --git a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
index fda4b4fb38..20844dfdcd 100644
--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
+++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
@@ -296,10 +296,10 @@ private:
double m_ElevationMax;
- SizeType m_OutputSize;
+ SizeType m_OutputSize{0,0};
IndexType m_OutputStartIndex;
- SpacingType m_OutputSpacing;
- OriginType m_OutputOrigin;
+ SpacingType m_OutputSpacing{0.0};
+ OriginType m_OutputOrigin{0.0};
SizeType m_Margin;
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
index 88d79d6d2e..9f5dc50269 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
@@ -152,7 +152,7 @@ private:
std::string m_FieldName;
std::string m_LayerName;
OGRwkbGeometryType m_GeometryType;
- SizeType m_StreamSize;
+ SizeType m_StreamSize{0,0};
std::vector<std::string> m_OGRLayerCreationOptions;
OGRFieldType m_FieldType;
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
index 2622b0d0e3..1306c6102f 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
@@ -185,9 +185,9 @@ private:
// Output params
std::string m_OutputProjectionRef;
- OutputSpacingType m_OutputSpacing;
- OutputOriginType m_OutputOrigin;
- OutputSizeType m_OutputSize;
+ OutputSpacingType m_OutputSpacing{0.0};
+ OutputOriginType m_OutputOrigin{0.0};
+ OutputSizeType m_OutputSize{0,0};
OutputIndexType m_OutputStartIndex;
}; // end of class VectorDataToLabelImageFilter
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
index 2562896ad3..7834cd8f09 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
@@ -195,9 +195,9 @@ private:
LabelType m_lab;
// TODO donc need this attribute now compute with VectorDataProperties
- SpacingType m_Spacing;
- OriginType m_Origin;
- SizeType m_Size;
+ SpacingType m_Spacing{0.0};
+ OriginType m_Origin{0.0};
+ SizeType m_Size{0,0};
IndexType m_StartIndex;
DirectionType m_Direction;
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
index 4f1a0d5ca4..7b73c4a091 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
@@ -228,9 +228,9 @@ private:
// TODO don't need this attributes now compute with VectorDataProperties
- SpacingType m_Spacing;
- OriginType m_Origin;
- SizeType m_Size;
+ SpacingType m_Spacing{0.0};
+ OriginType m_Origin{0.0};
+ SizeType m_Size{0,0};
IndexType m_StartIndex;
DirectionType m_Direction;
diff --git a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
index 94e190241f..3ee702b792 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
@@ -145,7 +145,7 @@ private:
OGRLayerStreamStitchingFilter(const Self&) = delete;
void operator=(const Self&) = delete;
- SizeType m_StreamSize;
+ SizeType m_StreamSize{0,0};
unsigned int m_Radius;
OGRLayerType m_OGRLayer;
};
--
GitLab