Commit d5b53356 authored by Julie Brossard's avatar Julie Brossard

Revert "BUG: Fixed Monteverdi compilation error"

This reverts commit b3c3a183.
parent 11fc472e
......@@ -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>
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
};
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 */
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
};
......
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