Merge pull request SimpleITK#897 from blowekamp/UpdateITKv5.1rc01

Update to ITKv5.1rc01
blowekamp · Dec 9, 2019 · b3cc759 · b3cc759
2 parents b1823b0 + c575a68
commit b3cc759
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 29 deletions.
diff --git a/Code/BasicFilters/json/CoherenceEnhancingDiffusionImageFilter.json b/Code/BasicFilters/json/CoherenceEnhancingDiffusionImageFilter.json
@@ -31,7 +31,7 @@
         "Isotropic"
       ],
       "default" : "itk::simple::CoherenceEnhancingDiffusionImageFilter::CED",
-      "itk_type" : "typename FilterType::EnhancementType",
+      "itk_type" : "typename FilterType::EnhancementEnum",
       "briefdescriptionSet" : "Switch between CED, EED, and variants.",
       "detaileddescriptionSet" : "",
       "briefdescriptionGet" : "",

diff --git a/Code/BasicFilters/json/ConvolutionImageFilter.json b/Code/BasicFilters/json/ConvolutionImageFilter.json
@@ -48,7 +48,7 @@
         "VALID"
       ],
       "default" : "itk::simple::ConvolutionImageFilter::SAME",
-      "custom_itk_cast" : "filter->SetOutputRegionMode( typename FilterType::OutputRegionModeType( int( this->m_OutputRegionMode ) ) );"
+      "custom_itk_cast" : "filter->SetOutputRegionMode( typename FilterType::OutputRegionModeEnum( int( this->m_OutputRegionMode ) ) );"
     }
   ],
   "tests" : [

diff --git a/Code/BasicFilters/json/FFTConvolutionImageFilter.json b/Code/BasicFilters/json/FFTConvolutionImageFilter.json
@@ -48,7 +48,7 @@
         "VALID"
       ],
       "default" : "itk::simple::FFTConvolutionImageFilter::SAME",
-      "itk_type" : "typename FilterType::OutputRegionModeType"
+      "itk_type" : "typename FilterType::OutputRegionModeEnum"
     }
   ],
   "tests" : [

diff --git a/Code/BasicFilters/json/InverseDeconvolutionImageFilter.json b/Code/BasicFilters/json/InverseDeconvolutionImageFilter.json
@@ -46,7 +46,7 @@
         "VALID"
       ],
       "default" : "itk::simple::InverseDeconvolutionImageFilter::SAME",
-      "itk_type" : "typename FilterType::OutputRegionModeType"
+      "itk_type" : "typename FilterType::OutputRegionModeEnum"
     }
   ],
   "tests" : [

diff --git a/Code/BasicFilters/json/LandweberDeconvolutionImageFilter.json b/Code/BasicFilters/json/LandweberDeconvolutionImageFilter.json
@@ -55,7 +55,7 @@
         "VALID"
       ],
       "default" : "itk::simple::LandweberDeconvolutionImageFilter::SAME",
-      "itk_type" : "typename FilterType::OutputRegionModeType"
+      "itk_type" : "typename FilterType::OutputRegionModeEnum"
     }
   ],
   "tests" : [

diff --git a/Code/BasicFilters/json/ProjectedLandweberDeconvolutionImageFilter.json b/Code/BasicFilters/json/ProjectedLandweberDeconvolutionImageFilter.json
@@ -55,7 +55,7 @@
         "VALID"
       ],
       "default" : "itk::simple::ProjectedLandweberDeconvolutionImageFilter::SAME",
-      "itk_type" : "typename FilterType::OutputRegionModeType"
+      "itk_type" : "typename FilterType::OutputRegionModeEnum"
     }
   ],
   "tests" : [

diff --git a/Code/BasicFilters/json/RichardsonLucyDeconvolutionImageFilter.json b/Code/BasicFilters/json/RichardsonLucyDeconvolutionImageFilter.json
@@ -46,7 +46,7 @@
         "VALID"
       ],
       "default" : "itk::simple::RichardsonLucyDeconvolutionImageFilter::SAME",
-      "itk_type" : "typename FilterType::OutputRegionModeType"
+      "itk_type" : "typename FilterType::OutputRegionModeEnum"
     }
   ],
   "tests" : [

diff --git a/Code/BasicFilters/json/TikhonovDeconvolutionImageFilter.json b/Code/BasicFilters/json/TikhonovDeconvolutionImageFilter.json
@@ -46,7 +46,7 @@
         "VALID"
       ],
       "default" : "itk::simple::TikhonovDeconvolutionImageFilter::SAME",
-      "itk_type" : "typename FilterType::OutputRegionModeType"
+      "itk_type" : "typename FilterType::OutputRegionModeEnum"
     }
   ],
   "tests" : [

diff --git a/Code/BasicFilters/json/WienerDeconvolutionImageFilter.json b/Code/BasicFilters/json/WienerDeconvolutionImageFilter.json
@@ -46,7 +46,7 @@
         "VALID"
       ],
       "default" : "itk::simple::WienerDeconvolutionImageFilter::SAME",
-      "itk_type" : "typename FilterType::OutputRegionModeType"
+      "itk_type" : "typename FilterType::OutputRegionModeEnum"
     }
   ],
   "tests" : [

diff --git a/Code/BasicFilters/src/sitkLandmarkBasedTransformInitializerFilter.cxx b/Code/BasicFilters/src/sitkLandmarkBasedTransformInitializerFilter.cxx
@@ -181,9 +181,9 @@ Transform LandmarkBasedTransformInitializerFilter::ExecuteInternal ( const Trans
 
   filter->SetLandmarkWeight ( this->m_LandmarkWeight );
 
-  typedef typename FilterType::TransformType::TransformCategoryType TransformCategoryType;
+  typedef typename FilterType::TransformType::TransformCategoryEnum TransformCategoryEnum;
   // BSpline specific setup
-  if( itkTx->GetTransformCategory() == TransformCategoryType::BSpline )
+  if( itkTx->GetTransformCategory() == TransformCategoryEnum::BSpline )
     {
     if ( this->m_ReferenceImage.GetSize() == std::vector<unsigned int>(this->m_ReferenceImage.GetDimension(), 0u) )
       {

diff --git a/Code/Common/src/sitkPimpleTransform.hxx b/Code/Common/src/sitkPimpleTransform.hxx
@@ -147,8 +147,8 @@ public:
 
   virtual bool IsLinear() const
     {
-      typedef itk::TransformBaseTemplate<double>::TransformCategoryType TransformCategoryType;
-      return (this->GetTransformBase()->GetTransformCategory() == TransformCategoryType::Linear);
+      typedef itk::TransformBaseTemplate<double>::TransformCategoryEnum TransformCategoryEnum;
+      return (this->GetTransformBase()->GetTransformCategory() == TransformCategoryEnum::Linear);
     }
 
 

diff --git a/Code/IO/src/sitkImageFileWriter.cxx b/Code/IO/src/sitkImageFileWriter.cxx
@@ -198,7 +198,7 @@ ::GetImageIOBase(const std::string &fileName)
   itk::ImageIOBase::Pointer iobase;
   if (this->m_ImageIOName == "")
     {
-    iobase = itk::ImageIOFactory::CreateImageIO( fileName.c_str(), itk::ImageIOFactory::FileModeType::WriteMode);
+    iobase = itk::ImageIOFactory::CreateImageIO( fileName.c_str(), itk::ImageIOFactory::FileModeEnum::WriteMode);
     }
   else
     {

diff --git a/Code/IO/src/sitkImageReaderBase.cxx b/Code/IO/src/sitkImageReaderBase.cxx
@@ -84,7 +84,7 @@ ::GetImageIOBase(const std::string &fileName)
   itk::ImageIOBase::Pointer iobase;
   if (this->m_ImageIOName == "")
     {
-    iobase = itk::ImageIOFactory::CreateImageIO( fileName.c_str(), itk::ImageIOFactory::FileModeType::ReadMode);
+    iobase = itk::ImageIOFactory::CreateImageIO( fileName.c_str(), itk::ImageIOFactory::FileModeEnum::ReadMode);
     }
   else
     {

diff --git a/Code/IO/src/sitkImageSeriesWriter.cxx b/Code/IO/src/sitkImageSeriesWriter.cxx
@@ -123,7 +123,7 @@ namespace itk {
     itk::ImageIOBase::Pointer iobase;
     if (this->m_ImageIOName == "")
       {
-      iobase = itk::ImageIOFactory::CreateImageIO( fileName.c_str(), itk::ImageIOFactory::FileModeType::WriteMode);
+      iobase = itk::ImageIOFactory::CreateImageIO( fileName.c_str(), itk::ImageIOFactory::FileModeEnum::WriteMode);
       }
     else
       {

diff --git a/SuperBuild/External_ITK.cmake b/SuperBuild/External_ITK.cmake
@@ -52,7 +52,7 @@ set(ITK_GIT_REPOSITORY "${git_protocol}://github.com/InsightSoftwareConsortium/I
 mark_as_advanced(ITK_GIT_REPOSITORY)
 sitk_legacy_naming(ITK_GIT_REPOSITORY ITK_REPOSITORY)
 
-set(_DEFAULT_ITK_GIT_TAG "9c5a74d213130f9e1f7bedb9ea34b4a5ae1f642e")
+set(_DEFAULT_ITK_GIT_TAG "v5.1rc01")
 set(ITK_GIT_TAG "${_DEFAULT_ITK_GIT_TAG}" CACHE STRING "Tag in ITK git repo")
 mark_as_advanced(ITK_GIT_TAG)
 set(ITK_TAG_COMMAND GIT_TAG "${ITK_GIT_TAG}")

diff --git a/Testing/Unit/sitkBasicFiltersTests.cxx b/Testing/Unit/sitkBasicFiltersTests.cxx
@@ -156,38 +156,38 @@ TEST(BasicFilters,FastMarching_ENUMCHECK) {
 
 TEST(BasicFilters,InverseDeconvolution_ENUMCHECK) {
   typedef itk::InverseDeconvolutionImageFilter< itk::Image<float,3>, itk::Image<float,3> > ITKType;
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::SAME, (int) itk::simple::InverseDeconvolutionImageFilter::SAME );
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::VALID, (int) itk::simple::InverseDeconvolutionImageFilter::VALID );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::SAME, (int) itk::simple::InverseDeconvolutionImageFilter::SAME );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::VALID, (int) itk::simple::InverseDeconvolutionImageFilter::VALID );
 }
 
 TEST(BasicFilters,TikhonovDeconvolution_ENUMCHECK) {
   typedef itk::TikhonovDeconvolutionImageFilter< itk::Image<float,3>, itk::Image<float,3> > ITKType;
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::SAME, (int) itk::simple::TikhonovDeconvolutionImageFilter::SAME );
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::VALID, (int) itk::simple::TikhonovDeconvolutionImageFilter::VALID );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::SAME, (int) itk::simple::TikhonovDeconvolutionImageFilter::SAME );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::VALID, (int) itk::simple::TikhonovDeconvolutionImageFilter::VALID );
 }
 
 TEST(BasicFilters,WienerDeconvolution_ENUMCHECK) {
   typedef itk::WienerDeconvolutionImageFilter< itk::Image<float,3>, itk::Image<float,3> > ITKType;
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::SAME, (int) itk::simple::WienerDeconvolutionImageFilter::SAME );
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::VALID, (int) itk::simple::WienerDeconvolutionImageFilter::VALID );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::SAME, (int) itk::simple::WienerDeconvolutionImageFilter::SAME );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::VALID, (int) itk::simple::WienerDeconvolutionImageFilter::VALID );
 }
 
 TEST(BasicFilters,LandweberDeconvolution_ENUMCHECK) {
   typedef itk::LandweberDeconvolutionImageFilter< itk::Image<float,3>, itk::Image<float,3> > ITKType;
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::SAME, (int) itk::simple::LandweberDeconvolutionImageFilter::SAME );
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::VALID, (int) itk::simple::LandweberDeconvolutionImageFilter::VALID );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::SAME, (int) itk::simple::LandweberDeconvolutionImageFilter::SAME );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::VALID, (int) itk::simple::LandweberDeconvolutionImageFilter::VALID );
 }
 
 TEST(BasicFilters,ProjectedLandweberDeconvolution_ENUMCHECK) {
   typedef itk::ProjectedLandweberDeconvolutionImageFilter< itk::Image<float,3>, itk::Image<float,3> > ITKType;
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::SAME, (int) itk::simple::ProjectedLandweberDeconvolutionImageFilter::SAME );
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::VALID, (int) itk::simple::ProjectedLandweberDeconvolutionImageFilter::VALID );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::SAME, (int) itk::simple::ProjectedLandweberDeconvolutionImageFilter::SAME );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::VALID, (int) itk::simple::ProjectedLandweberDeconvolutionImageFilter::VALID );
 }
 
 TEST(BasicFilters,RichardsonLucyDeconvolution_ENUMCHECK) {
   typedef itk::RichardsonLucyDeconvolutionImageFilter< itk::Image<float,3>, itk::Image<float,3> > ITKType;
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::SAME, (int) itk::simple::RichardsonLucyDeconvolutionImageFilter::SAME );
-  EXPECT_EQ( (int) ITKType::OutputRegionModeType::VALID, (int) itk::simple::RichardsonLucyDeconvolutionImageFilter::VALID );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::SAME, (int) itk::simple::RichardsonLucyDeconvolutionImageFilter::SAME );
+  EXPECT_EQ( (int) ITKType::OutputRegionModeEnum::VALID, (int) itk::simple::RichardsonLucyDeconvolutionImageFilter::VALID );
 }
 
 TEST(BasicFilters,LabelMapContourOverlay_ENUMCHECK) {