Commit 867f0c1b authored by Manuel Grizonnet's avatar Manuel Grizonnet

Merge branch 'warnings_shadow_declaration' into 'develop'

WRG: fix warnings declaration shadows a previous local seen with gcc 8

See merge request !225
parents 4db72a15 5f3aa71e
......@@ -183,7 +183,6 @@ private:
bool IsInsideWithNeighborhoodRadius(const RegionType& region, const ContinuousIndexType &index) const
{
typedef typename RegionType::IndexType IndexType;
typedef typename IndexType::IndexValueType IndexValueType;
typedef typename ContinuousIndexType::ValueType ContinuousIndexValueType;
......
......@@ -194,7 +194,6 @@ private:
bool
IsInsideWithNeighborhoodRadius(const RegionType& region, const ContinuousIndexType &index) const
{
typedef typename RegionType::IndexType IndexType;
typedef typename IndexType::IndexValueType IndexValueType;
for(unsigned int i=0; i<ImageDimension; ++i)
......
......@@ -58,7 +58,7 @@ ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
m_GradientMagnitudeThreshold = 0.2;
m_ExpandFilter = ExpandFilterType::New();
const double HistogramGaussianWeights[73] = {
2.3771112282795414e-07, 3.8860734758633732e-07, 6.2655544995978937e-07, 9.9631120821413786e-07,
1.5624909838697011e-06, 2.4167238265599128e-06, 3.6865788528530121e-06,
......@@ -82,9 +82,9 @@ ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
2.4167238265599128e-06, 1.5624909838697011e-06, 9.9631120821413786e-07,
6.2655544995978937e-07, 3.8860734758633732e-07, 2.3771112282795414e-07
};
m_HistogramGaussianWeights = std::vector<double>(HistogramGaussianWeights,HistogramGaussianWeights+73);
m_Offsets[0][0]=-1;
m_Offsets[0][1]=-1;
m_Offsets[1][0]=-1;
......@@ -896,9 +896,7 @@ void
ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
typedef itk::ProcessObject ProcessObjectType;
const OutputPointSetType* output = dynamic_cast<const OutputPointSetType*>(this->ProcessObjectType::GetOutput(0));
const OutputPointSetType* output = dynamic_cast<const OutputPointSetType*>(this->Superclass::ProcessObjectType::GetOutput(0));
Superclass::PrintSelf(os, indent);
os << indent << "Number of octaves: " << m_OctavesNumber << std::endl;
......
......@@ -57,12 +57,6 @@ KullbackLeiblerSupervizedDistance<TInput1, TInput2, TInputROIImage, TOutput>
const typename TInput2::ImageType * img2,
const TInputROIImage * imgROI)
{
typedef ROIdataConversion<typename TInput1::ImageType, TInputROIImage>
ROIConversionType1;
typedef itk::ConstNeighborhoodIterator<
typename ROIConversionType1::OutputImageType> ROIInputType1;
typename ROIConversionType1::Pointer conversion1 = ROIConversionType1::New();
conversion1->SetInputImage(img1);
conversion1->SetROIImage(imgROI);
......
......@@ -43,8 +43,6 @@ typename CompacityPathFunction<TInputPath,
CompacityPathFunction<TInputPath, TOutput>
::Evaluate(const PathType& path) const
{
typedef double RealType;
VertexListPointer vertexList;
VertexType cindex;
VertexType IndexOut;
......
......@@ -44,8 +44,6 @@ typename OrientationPathFunction<TInputPath,
OrientationPathFunction<TInputPath, TOutput>
::Evaluate(const PathType& path) const
{
typedef double RealType;
VertexListPointer vertexList;
VertexType cindex;
VertexType IndexOut;
......
......@@ -88,12 +88,13 @@ public:
typedef typename InputGraphType::VertexDescriptorType VertexDescriptorType;
typedef typename InputGraphType::RCC8ValueType RCC8ValueType;
typedef typename VertexType::AttributesMapType AttributesMapType;
typedef typename AttributesMapType::iterator IteratorType;
/** Set the filename */
itkSetStringMacro(FileName);
/** Get the filename */
itkGetStringMacro(FileName);
using Superclass::SetInput;
/**
* Set the input graph.
......
......@@ -203,7 +203,6 @@ RCC8GraphFileWriter<TInputGraph>
::WriteVertex(std::ofstream& of, VertexDescriptorType index,
VertexPointerType vertex)
{
typedef typename VertexType::AttributesMapType AttributesMapType;
typedef typename AttributesMapType::iterator IteratorType;
AttributesMapType attr = vertex->GetAttributesMap();
otbMsgDevMacro(<< "RCC8GraphFileWriter: WriteVertex call: " << index);
......
......@@ -295,7 +295,6 @@ VectorDataToLabelMapFilter<TVectorData, TLabelMap>
CorrectFunctorType correct;
PolygonPointerType correctPolygonExtRing = correct(dataNode->GetPolygonExteriorRing());
typedef typename DataNodeType::PolygonType PolygonType;
typedef typename PolygonType::RegionType RegionType;
typedef typename PolygonType::VertexType VertexType;
typedef typename IndexType::IndexValueType IndexValueType;
......
......@@ -298,7 +298,7 @@ VectorImageModel
// Get build-context settings.
VectorImageSettings * const settings =
static_cast< VectorImageSettings * const >( buildContext->m_Settings );
static_cast< VectorImageSettings * >( buildContext->m_Settings );
// Fetch the no data flags if any
......
......@@ -378,7 +378,7 @@ TreeWidget
}
/*******************************************************************************/
void
void
TreeWidget
::dragMoveEvent( QDragMoveEvent* e )
{
......@@ -435,7 +435,7 @@ TreeWidget
}
/*******************************************************************************/
void
void
TreeWidget
::dropEvent( QDropEvent* e )
{
......@@ -443,8 +443,6 @@ TreeWidget
// qDebug() << this << "::dropEvent(" << e << ")";
typedef QList< QTreeWidgetItem* > QTreeWidgetItemList;
QTreeWidgetItemList itemList;
DecodeMimeData( itemList, e->mimeData() );
......@@ -467,7 +465,7 @@ TreeWidget
while( !item->flags().testFlag( Qt::ItemIsDropEnabled ) )
{
item = item->parent();
assert( item!=NULL );
assert( item!=NULL );
#if 1
qDebug()
......@@ -533,7 +531,7 @@ operator << ( QDataStream& out, QTreeWidgetItem const * item )
"QDataStream& operator << ( QDataStream&, QTreeWidgetItem const * & );";
*/
#if 0 // operator >> is used in QT5 this lead to wrong call, fix: comment or
#if 0 // operator >> is used in QT5 this lead to wrong call, fix: comment or
// put operator >> def and decl in a specific namespace.
return operator << < QTreeWidgetItem >( out, item );
......@@ -554,7 +552,7 @@ operator >>( QDataStream& in, QTreeWidgetItem * & item )
"QDataStream& operator >> ( QDataStream&, QTreeWidgetItem * & );";
*/
#if 0
#if 0
return operator >> < QTreeWidgetItem >( in, item );
#else // DATA_STREAM_USE_TEMPLATE_OPERATORS
......
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