Skip to content

Fix directed hausdorff distance valgrind #2413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
N-Dekker merged 2 commits into from
Mar 17, 2021
Merged

Fix directed hausdorff distance valgrind #2413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aef6384
BUG: Initialize member variables
blowekamp Mar 16, 2021
7e77b79
STYLE: Prefer in class initialization
blowekamp Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,17 @@ class ITK_TEMPLATE_EXPORT DirectedHausdorffDistanceImageFilter : public ImageToI
using DistanceMapPointer = typename DistanceMapType::Pointer;


DistanceMapPointer m_DistanceMap;
DistanceMapPointer m_DistanceMap{ nullptr };

RealType m_MaxDistance;
IdentifierType m_PixelCount;
RealType m_MaxDistance{ NumericTraits<RealType>::ZeroValue() };
IdentifierType m_PixelCount{};

using CompensatedSummationType = itk::CompensatedSummation<RealType>;
CompensatedSummationType m_Sum;

RealType m_DirectedHausdorffDistance;
RealType m_AverageHausdorffDistance;
bool m_UseImageSpacing;
RealType m_DirectedHausdorffDistance{ NumericTraits<RealType>::ZeroValue() };
RealType m_AverageHausdorffDistance{ NumericTraits<RealType>::ZeroValue() };
bool m_UseImageSpacing{ true };

std::mutex m_Mutex;
}; // end of class
Expand Down
8 changes: 1 addition & 7 deletions Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ DirectedHausdorffDistanceImageFilter<TInputImage1, TInputImage2>::DirectedHausdo
// this filter requires two input images
this->SetNumberOfRequiredInputs(2);

m_DistanceMap = nullptr;
m_DirectedHausdorffDistance = NumericTraits<RealType>::ZeroValue();
m_AverageHausdorffDistance = NumericTraits<RealType>::ZeroValue();
m_UseImageSpacing = true;


this->DynamicMultiThreadingOn();
this->ThreaderUpdateProgressOff();
}
Expand Down Expand Up @@ -214,7 +208,7 @@ DirectedHausdorffDistanceImageFilter<TInputImage1, TInputImage2>::PrintSelf(std:
<< static_cast<typename NumericTraits<RealType>::PrintType>(m_DirectedHausdorffDistance) << std::endl;
os << indent << "AverageHausdorffDistance: "
<< static_cast<typename NumericTraits<RealType>::PrintType>(m_AverageHausdorffDistance) << std::endl;
os << indent << "UseImageSpacing : " << m_UseImageSpacing << std::endl;
os << indent << "UseImageSpacing: " << m_UseImageSpacing << std::endl;
}
} // end namespace itk
#endif
2 changes: 1 addition & 1 deletion Modules/Filtering/DistanceMap/include/itkHausdorffDistanceImageFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ HausdorffDistanceImageFilter<TInputImage1, TInputImage2>::PrintSelf(std::ostream

os << indent << "HausdorffDistance: " << m_HausdorffDistance << std::endl;
os << indent << "AverageHausdorffDistance: " << m_AverageHausdorffDistance << std::endl;
os << indent << "Use Image Spacing : " << m_UseImageSpacing << std::endl;
os << indent << "Use Image Spacing: " << m_UseImageSpacing << std::endl;
}
} // end namespace itk
#endif