Skip to content

BUG: Fix move of histogram smart pointer #146

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
hjmjohnson merged 1 commit into from
Nov 7, 2018
Merged

BUG: Fix move of histogram smart pointer #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Modules/Numerics/Statistics/include/itkImageToHistogramFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class ITK_TEMPLATE_EXPORT ImageToHistogramFilter:public ImageTransformer<TImage>
virtual void ThreadedComputeMinimumAndMaximum( const RegionType & inputRegionForThread );


virtual void ThreadedMergeHistogram( HistogramType *histogram );
virtual void ThreadedMergeHistogram( HistogramPointer &&histogram );

std::mutex m_Mutex;

Expand Down
4 changes: 2 additions & 2 deletions Modules/Numerics/Statistics/include/itkImageToHistogramFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,13 @@ ImageToHistogramFilter< TImage >
++inputIt;
}

this->ThreadedMergeHistogram( histogram );
this->ThreadedMergeHistogram( std::move(histogram) );
}

template< typename TImage >
void
ImageToHistogramFilter< TImage >
::ThreadedMergeHistogram(HistogramType *histogram)
::ThreadedMergeHistogram(HistogramPointer &&histogram)
{
while (true)
{
Expand Down
2 changes: 1 addition & 1 deletion Modules/Numerics/Statistics/include/itkMaskedImageToHistogramFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ MaskedImageToHistogramFilter< TImage, TMaskImage >
}


this->ThreadedMergeHistogram( histogram );
this->ThreadedMergeHistogram( std::move(histogram) );
}

} // end of namespace Statistics
Expand Down