Merge pull request #15 from thewtex/azure-itk-version

ENH: Bump Azure ITK version for ITK 5.0.0

Author: thewtex

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;

include/itkSiddonJacobsRayCastInterpolateImageFunction.h

@@ -182,6 +182,18 @@ class SiddonJacobsRayCastInterpolateImageFunction :
     return true;
   }
 
+#if !defined(ITKV4_COMPATIBILITY)
+  SizeType GetRadius() const override
+    {
+    const InputImageType* input = this->GetInputImage();
+    if ( !input )
+      {
+      itkExceptionMacro( "Input image required!" );
+      }
+    return input->GetLargestPossibleRegion().GetSize();
+    }
+#endif
+
 protected:
   SiddonJacobsRayCastInterpolateImageFunction();
 

include/itkTwoProjectionImageRegistrationMethod.h

@@ -199,10 +199,6 @@ class TwoProjectionImageRegistrationMethod : public ProcessObject
   using Superclass::MakeOutput;
   DataObjectPointer MakeOutput( DataObjectPointerArraySizeType idx) override;
 
-  /** Method to return the latest modified time of this object or
-   * any of its cached ivars */
-  unsigned long GetMTime() const override;
-
 protected:
   TwoProjectionImageRegistrationMethod();
   ~TwoProjectionImageRegistrationMethod() override {};

include/itkTwoProjectionImageRegistrationMethod.hxx

@@ -58,71 +58,6 @@ TwoProjectionImageRegistrationMethod<TFixedImage,TMovingImage>
 }
 
 
-template < typename TFixedImage, typename TMovingImage >
-unsigned long
-TwoProjectionImageRegistrationMethod<TFixedImage,TMovingImage>
-::GetMTime() const
-{
-  unsigned long mtime = Superclass::GetMTime();
-  unsigned long m;
-
-
-  // Some of the following should be removed once ivars are put in the
-  // input and output lists
-
-  if (m_Transform)
-    {
-    m = m_Transform->GetMTime();
-    mtime = (m > mtime ? m : mtime);
-    }
-
-  if (m_Interpolator1)
-    {
-    m = m_Interpolator1->GetMTime();
-    mtime = (m > mtime ? m : mtime);
-    }
-
-  if (m_Interpolator2)
-    {
-    m = m_Interpolator2->GetMTime();
-    mtime = (m > mtime ? m : mtime);
-    }
-
-  if (m_Metric)
-    {
-    m = m_Metric->GetMTime();
-    mtime = (m > mtime ? m : mtime);
-    }
-
-  if (m_Optimizer)
-    {
-    m = m_Optimizer->GetMTime();
-    mtime = (m > mtime ? m : mtime);
-    }
-
-  if (m_FixedImage1)
-    {
-    m = m_FixedImage1->GetMTime();
-    mtime = (m > mtime ? m : mtime);
-    }
-
-  if (m_FixedImage2)
-    {
-    m = m_FixedImage2->GetMTime();
-    mtime = (m > mtime ? m : mtime);
-    }
-
-  if (m_MovingImage)
-    {
-    m = m_MovingImage->GetMTime();
-    mtime = (m > mtime ? m : mtime);
-    }
-
-  return mtime;
-
-}
-
-
 template < typename TFixedImage, typename TMovingImage >
 void
 TwoProjectionImageRegistrationMethod<TFixedImage,TMovingImage>

test/azure-pipelines.yml

@@ -1,5 +1,6 @@
 variables:
-  ITKGitTag: v5.0rc01
+  ITKGitTag: v5.0.0
+  ITKPythonGitTag: v5.0.0.post1
   CMakeBuildType: Release
 
 trigger:
@@ -156,7 +157,7 @@ jobs:
     displayName: 'Fetch build script'
 
   - script: |
-      export ITK_PACKAGE_VERSION=$(ITKGitTag)
+      export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
       ./dockcross-manylinux-download-cache-and-build-module-wheels.sh
     displayName: 'Build Python packages'
 
@@ -171,7 +172,7 @@ jobs:
   timeoutInMinutes: 0
   cancelTimeoutInMinutes: 300
   pool:
-    vmImage: 'macos-10.13'
+    vmImage: 'macos-10.14'
 
   steps:
   - script: |
@@ -180,7 +181,7 @@ jobs:
     displayName: 'Fetch build script'
 
   - script: |
-      export ITK_PACKAGE_VERSION=$(ITKGitTag)
+      export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
       ./macpython-download-cache-and-build-module-wheels.sh
     displayName: 'Build Python packages'
 
@@ -204,7 +205,7 @@ jobs:
 
   - script: |
       call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-      set ITK_PACKAGE_VERSION=$(ITKGitTag)
+      set ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
       set CC=cl.exe
       set CXX=cl.exe
       powershell.exe -file .\windows-download-cache-and-build-module-wheels.ps1