Skip to content

STYLE: sync #58

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
mstaring merged 1 commit into from
Mar 27, 2018
Merged

STYLE: sync #58

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
27 changes: 15 additions & 12 deletions Common/CostFunctions/itkAdvancedImageToImageMetric.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,9 @@ AdvancedImageToImageMetric< TFixedImage, TMovingImage >

} // end InitializeThreadingParameters()


/**
* ****************** InitializeLimiter *****************************
* ****************** InitializeLimiters *****************************
*/

template< class TFixedImage, class TMovingImage >
Expand All @@ -249,18 +250,19 @@ AdvancedImageToImageMetric< TFixedImage, TMovingImage >
timer.Start();

typedef typename itk::ComputeImageExtremaFilter<FixedImageType> ComputeFixedImageExtremaFilterType;
typename ComputeFixedImageExtremaFilterType::Pointer computeFixedImageExtrema = ComputeFixedImageExtremaFilterType::New();
typename ComputeFixedImageExtremaFilterType::Pointer computeFixedImageExtrema
= ComputeFixedImageExtremaFilterType::New();
computeFixedImageExtrema->SetInput( this->GetFixedImage() );
computeFixedImageExtrema->SetImageRegion( this->GetFixedImageRegion() );
if( this->m_FixedImageMask.IsNotNull() )
{
computeFixedImageExtrema->SetUseMask( true );

const FixedImageMaskSpatialObject2Type * fmask
const FixedImageMaskSpatialObject2Type * fMask
= dynamic_cast< const FixedImageMaskSpatialObject2Type * >( this->m_FixedImageMask.GetPointer() );
if( fmask )
if( fMask )
{
computeFixedImageExtrema->SetImageSpatialMask( fmask );
computeFixedImageExtrema->SetImageSpatialMask( fMask );
}
else
{
Expand All @@ -270,8 +272,8 @@ AdvancedImageToImageMetric< TFixedImage, TMovingImage >

computeFixedImageExtrema->Update();
timer.Stop();
elxout << " Computing the FixedImageExtrema took "
<< static_cast< long >(timer.GetMean() * 1000) << " ms." << std::endl;
elxout << " Computing the fixed image extrema took "
<< static_cast< long >( timer.GetMean() * 1000 ) << " ms." << std::endl;

this->m_FixedImageTrueMax = computeFixedImageExtrema->GetMaximum();
this->m_FixedImageTrueMin = computeFixedImageExtrema->GetMinimum();
Expand Down Expand Up @@ -303,8 +305,9 @@ AdvancedImageToImageMetric< TFixedImage, TMovingImage >
timer.Start();

typedef typename itk::ComputeImageExtremaFilter<MovingImageType> ComputeMovingImageExtremaFilterType;
typename ComputeMovingImageExtremaFilterType::Pointer computeMovingImageExtrema = ComputeMovingImageExtremaFilterType::New();
computeMovingImageExtrema->SetInput( this->GetMovingImage() );
typename ComputeMovingImageExtremaFilterType::Pointer computeMovingImageExtrema
= ComputeMovingImageExtremaFilterType::New();
computeMovingImageExtrema->SetInput( this->GetMovingImage() );
computeMovingImageExtrema->SetImageRegion( this->GetMovingImage()->GetBufferedRegion() );
if( this->m_MovingImageMask.IsNotNull() )
{
Expand All @@ -323,8 +326,8 @@ AdvancedImageToImageMetric< TFixedImage, TMovingImage >
computeMovingImageExtrema->Update();

timer.Stop();
elxout << " Computing the MovingImageExtrema took "
<< static_cast< long >(timer.GetMean() * 1000) << " ms." << std::endl;
elxout << " Computing the moving image extrema took "
<< static_cast< long >( timer.GetMean() * 1000 ) << " ms." << std::endl;

this->m_MovingImageTrueMax = computeMovingImageExtrema->GetMaximum();
this->m_MovingImageTrueMin = computeMovingImageExtrema->GetMinimum();
Expand All @@ -344,7 +347,7 @@ AdvancedImageToImageMetric< TFixedImage, TMovingImage >
this->m_MovingImageLimiter->Initialize();
}

} // end InitializeLimiter()
} // end InitializeLimiters()


/**
Expand Down
1 change: 0 additions & 1 deletion Common/itkComputeDisplacementDistribution.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ class ComputeDisplacementDistribution :

SizeValueType m_NumberOfPixelsCounted;
bool m_UseMultiThread;
ScalesType m_Scales;
ImageSampleContainerPointer m_SampleContainer;

private:
Expand Down