COMP: Use SpatialObject explicit IsInsideWorldSpace API for ITK 5

thewtex · thewtex · commit 3954c444f892 · 2019-06-26T21:53:43.000-04:00
diff --git a/include/itkNormalizedCorrelationTwoImageToOneImageMetric.hxx b/include/itkNormalizedCorrelationTwoImageToOneImageMetric.hxx
@@ -83,15 +83,15 @@ NormalizedCorrelationTwoImageToOneImageMetric<TFixedImage,TMovingImage>
 
     fixedImage1->TransformIndexToPhysicalPoint( index, inputPoint );
 
-    if( this->m_FixedImageMask1 && !this->m_FixedImageMask1->IsInside( inputPoint ) )
+    if( this->m_FixedImageMask1 && !this->m_FixedImageMask1->IsInsideInWorldSpace( inputPoint ) )
       {
       ++ti1;
       continue;
       }
 
 //    typename Superclass::OutputPointType transformedPoint = this->m_Transform->TransformPoint( inputPoint );
 
-    if( this->m_MovingImageMask && !this->m_MovingImageMask->IsInside( inputPoint ) )
+    if( this->m_MovingImageMask && !this->m_MovingImageMask->IsInsideInWorldSpace( inputPoint ) )
       {
       ++ti1;
       continue;
@@ -158,15 +158,15 @@ NormalizedCorrelationTwoImageToOneImageMetric<TFixedImage,TMovingImage>
 //    typename Superclass::InputPointType inputPoint;
     fixedImage2->TransformIndexToPhysicalPoint( index, inputPoint );
 
-    if( this->m_FixedImageMask2 && !this->m_FixedImageMask2->IsInside( inputPoint ) )
+    if( this->m_FixedImageMask2 && !this->m_FixedImageMask2->IsInsideInWorldSpace( inputPoint ) )
       {
       ++ti2;
       continue;
       }
 
 //    typename Superclass::OutputPointType transformedPoint = this->m_Transform->TransformPoint( inputPoint );
 
-    if( this->m_MovingImageMask && !this->m_MovingImageMask->IsInside( inputPoint ) )
+    if( this->m_MovingImageMask && !this->m_MovingImageMask->IsInsideInWorldSpace( inputPoint ) )
       {
       ++ti2;
       continue;

Original file line number	Diff line number	Diff line change
`@@ -83,15 +83,15 @@ NormalizedCorrelationTwoImageToOneImageMetric<TFixedImage,TMovingImage>`
`83`	`83`
`84`	`84`	`fixedImage1->TransformIndexToPhysicalPoint( index, inputPoint );`
`85`	`85`
`86`		`- if( this->m_FixedImageMask1 && !this->m_FixedImageMask1->IsInside( inputPoint ) )`
	`86`	`+ if( this->m_FixedImageMask1 && !this->m_FixedImageMask1->IsInsideInWorldSpace( inputPoint ) )`
`87`	`87`	`{`
`88`	`88`	`++ti1;`
`89`	`89`	`continue;`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// typename Superclass::OutputPointType transformedPoint = this->m_Transform->TransformPoint( inputPoint );`
`93`	`93`
`94`		`- if( this->m_MovingImageMask && !this->m_MovingImageMask->IsInside( inputPoint ) )`
	`94`	`+ if( this->m_MovingImageMask && !this->m_MovingImageMask->IsInsideInWorldSpace( inputPoint ) )`
`95`	`95`	`{`
`96`	`96`	`++ti1;`
`97`	`97`	`continue;`
`@@ -158,15 +158,15 @@ NormalizedCorrelationTwoImageToOneImageMetric<TFixedImage,TMovingImage>`
`158`	`158`	`// typename Superclass::InputPointType inputPoint;`
`159`	`159`	`fixedImage2->TransformIndexToPhysicalPoint( index, inputPoint );`
`160`	`160`
`161`		`- if( this->m_FixedImageMask2 && !this->m_FixedImageMask2->IsInside( inputPoint ) )`
	`161`	`+ if( this->m_FixedImageMask2 && !this->m_FixedImageMask2->IsInsideInWorldSpace( inputPoint ) )`
`162`	`162`	`{`
`163`	`163`	`++ti2;`
`164`	`164`	`continue;`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`// typename Superclass::OutputPointType transformedPoint = this->m_Transform->TransformPoint( inputPoint );`
`168`	`168`
`169`		`- if( this->m_MovingImageMask && !this->m_MovingImageMask->IsInside( inputPoint ) )`
	`169`	`+ if( this->m_MovingImageMask && !this->m_MovingImageMask->IsInsideInWorldSpace( inputPoint ) )`
`170`	`170`	`{`
`171`	`171`	`++ti2;`
`172`	`172`	`continue;`