template <class args_info_type, class FixedImageType, class MovingImageType>
GenericMetric<args_info_type, FixedImageType, MovingImageType>::GenericMetric()
{
- m_Metric=NULL;
+ m_Metric=ITK_NULLPTR;
m_Maximize=false;
m_Verbose=false;
m_FixedImageRegionGiven=false;
-#ifdef ITK_USE_OPTIMISED_REGISTRATION_METHODS
m_FixedImageSamplesIntensityThreshold=0;
m_UseFixedImageSamplesIntensityThreshold=false;
-#endif
- m_FixedImageMask=NULL;
+ m_FixedImageMask=ITK_NULLPTR;
}
typedef itk::ImageMaskSpatialObject<itkGetStaticConstMacro(FixedImageDimension)> ImageMaskSpatialObjectType;
- typename ImageMaskSpatialObjectType::ConstPointer mask = NULL;
+ typename ImageMaskSpatialObjectType::ConstPointer mask = ITK_NULLPTR;
if (m_FixedImageMask.IsNotNull())
mask = dynamic_cast<const ImageMaskSpatialObjectType*>(m_FixedImageMask.GetPointer());
m_Metric->SetFixedImageRegion(m_FixedImageRegion);
//m_Metric->SetFixedImageRegion(mask_region);
-
-#ifdef ITK_USE_OPTIMIZED_REGISTRATION_METHODS
-
//============================================================================
// Set the lower intensity threshold
if (m_ArgsInfo.intThreshold_given) {
}
// Intensity?
+ /*
if( m_UseFixedImageSamplesIntensityThreshold &&
( regionIter.Get() < m_FixedImageSamplesIntensityThreshold) ) {
++regionIter; // jump to next pixel
continue;
}
+ */
// Add point to the numbers
fiic.push_back(index);
}
// Intensity?
- if( m_UseFixedImageSamplesIntensityThreshold &&
- randIter.Get() < m_FixedImageSamplesIntensityThreshold ) {
- ++randIter;
- //if (m_Verbose) std::cout << "not in threshold" << std::endl;
- count_not_thres++;
- continue;
- }
+// if( m_UseFixedImageSamplesIntensityThreshold &&
+// randIter.Get() < m_FixedImageSamplesIntensityThreshold ) {
+// ++randIter;
+// //if (m_Verbose) std::cout << "not in threshold" << std::endl;
+// count_not_thres++;
+// continue;
+// }
// Add point to the numbers
fiic.push_back(index);
if (m_Verbose) std::cout<<"number of mask pixels "<<totalNumberOfMaskPixels<<std::endl;
}
-
-#else
- if (m_Verbose) std::cout<<"Not setting the fixed image intensity threshold or the fraction of samples to use (not compiled with USE_OPTIMIZED_REGISTRATION_METHODS)..."<<std::endl;
-
-
-#endif
//============================================================================
//return the pointer
return m_Metric;