Skip to content
Snippets Groups Projects
Commit 2eb60344 authored by Julien Michel's avatar Julien Michel
Browse files

WRG: Fixing shadowed variables warnings

parent b6331dc3
Branches
Tags
No related merge requests found
...@@ -563,13 +563,13 @@ ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage> ...@@ -563,13 +563,13 @@ ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
if (m_ComputeFeretDiameter) if (m_ComputeFeretDiameter)
{ {
// init the vars // init the vars
unsigned long size = 0; unsigned long ssize = 0;
typedef typename std::deque<typename LabelObjectType::IndexType> IndexListType; typedef typename std::deque<typename LabelObjectType::IndexType> IndexListType;
IndexListType idxList; IndexListType idxList;
// Line iterator // Line iterator
ConstLineIteratorType lit = ConstLineIteratorType(lo); ConstLineIteratorType llit = ConstLineIteratorType(lo);
lit.GoToBegin(); llit.GoToBegin();
typedef typename itk::ConstNeighborhoodIterator<LabelImageType> NeighborIteratorType; typedef typename itk::ConstNeighborhoodIterator<LabelImageType> NeighborIteratorType;
typename TLabelImage::SizeType neighborHoodRadius; typename TLabelImage::SizeType neighborHoodRadius;
...@@ -582,10 +582,10 @@ ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage> ...@@ -582,10 +582,10 @@ ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
it.GoToBegin(); it.GoToBegin();
// iterate over all the lines // iterate over all the lines
while ( !lit.IsAtEnd() ) while ( !llit.IsAtEnd() )
{ {
const typename LabelObjectType::IndexType& firstIdx = lit.GetLine().GetIndex(); const typename LabelObjectType::IndexType& firstIdx = llit.GetLine().GetIndex();
unsigned long length = lit.GetLine().GetLength(); unsigned long length = llit.GetLine().GetLength();
long endIdx0 = firstIdx[0] + length; long endIdx0 = firstIdx[0] + length;
for (typename LabelObjectType::IndexType idx = firstIdx; idx[0] < endIdx0; idx[0]++) for (typename LabelObjectType::IndexType idx = firstIdx; idx[0] < endIdx0; idx[0]++)
...@@ -600,12 +600,12 @@ ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage> ...@@ -600,12 +600,12 @@ ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
if (it.GetPixel(i) != label) if (it.GetPixel(i) != label)
{ {
idxList.push_back(idx); idxList.push_back(idx);
size++; ssize++;
break; break;
} }
} }
} }
++lit; ++llit;
} }
// we can now search the feret diameter // we can now search the feret diameter
......
...@@ -109,9 +109,9 @@ ConcatenateVectorDataFilter<TVectorData> ...@@ -109,9 +109,9 @@ ConcatenateVectorDataFilter<TVectorData>
{ {
// Add the current vectordata // Add the current vectordata
TreeNodeType * TreeNodeType *
inputRoot = const_cast<TreeNodeType *>(this->GetInput(idx)->GetDataTree()->GetRoot()); currentInputRoot = const_cast<TreeNodeType *>(this->GetInput(idx)->GetDataTree()->GetRoot());
ProcessNode(inputRoot, outputDocument); ProcessNode(currentInputRoot, outputDocument);
} }
......
...@@ -131,7 +131,7 @@ BayesianFusionFilter<TInputMultiSpectralImage, ...@@ -131,7 +131,7 @@ BayesianFusionFilter<TInputMultiSpectralImage,
covComputefilter->SetInput(multiSpecInterp); covComputefilter->SetInput(multiSpecInterp);
covComputefilter->Update(); covComputefilter->Update();
MatrixType m_CovarianceMatrix = covComputefilter->GetCovariance(); m_CovarianceMatrix = covComputefilter->GetCovariance();
otbMsgDebugMacro(<< "Covariance: " << m_CovarianceMatrix); otbMsgDebugMacro(<< "Covariance: " << m_CovarianceMatrix);
m_CovarianceInvMatrix = m_CovarianceMatrix.GetInverse(); m_CovarianceInvMatrix = m_CovarianceMatrix.GetInverse();
......
...@@ -92,7 +92,7 @@ void VCAImageFilter<TImage>::GenerateData() ...@@ -92,7 +92,7 @@ void VCAImageFilter<TImage>::GenerateData()
vnl_matrix<PrecisionType> R = statsInput->GetCorrelation().GetVnlMatrix(); vnl_matrix<PrecisionType> R = statsInput->GetCorrelation().GetVnlMatrix();
vnl_svd<PrecisionType> svd(R); vnl_svd<PrecisionType> svd(R);
vnl_matrix<PrecisionType> U = svd.U(); vnl_matrix<PrecisionType> U = svd.U();
vnl_matrix<PrecisionType> Ud = U.get_n_columns(0, m_NumberOfEndmembers); Ud = U.get_n_columns(0, m_NumberOfEndmembers);
vnl_matrix<PrecisionType> Udt = Ud.transpose(); vnl_matrix<PrecisionType> Udt = Ud.transpose();
// To remove the mean // To remove the mean
......
...@@ -33,9 +33,9 @@ PyCommand::~PyCommand() ...@@ -33,9 +33,9 @@ PyCommand::~PyCommand()
this->obj = NULL; this->obj = NULL;
} }
void PyCommand::SetCommandCallable(PyObject *obj) void PyCommand::SetCommandCallable(PyObject *theObj)
{ {
if (obj != this->obj) if (theObj != this->obj)
{ {
if (this->obj) if (this->obj)
{ {
...@@ -44,7 +44,7 @@ void PyCommand::SetCommandCallable(PyObject *obj) ...@@ -44,7 +44,7 @@ void PyCommand::SetCommandCallable(PyObject *obj)
} }
// store the new object // store the new object
this->obj = obj; this->obj = theObj;
if (this->obj) if (this->obj)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment