Merge pull request #5768 from N-Dekker/Future-default-not-using-legacy-SobelOperatorCoordinates

Author: dzenanz

Modules/Core/Common/include/itkSobelOperator.h

@@ -158,7 +158,11 @@ class ITK_TEMPLATE_EXPORT SobelOperator : public NeighborhoodOperator<TPixel, VD
   Fill(const CoefficientVector & coeff) override;
 
 private:
+#ifdef ITK_FUTURE_LEGACY_REMOVE
+  bool m_UseLegacyCoefficients{ false };
+#else
   bool m_UseLegacyCoefficients{ true };
+#endif
 };
 } // namespace itk
 

Modules/Core/Common/test/itkSobelOperatorGTest.cxx

@@ -73,6 +73,18 @@ TEST(SobelOperator, ExerciseBasicObjectMethods)
 }
 
 
+// Checks that the operator uses legacy coefficients by default, unless ITK_FUTURE_LEGACY_REMOVE is enabled.
+TEST(SobelOperator, IsUsingLegacyCoefficientsByDefaultUnlessFutureLegacyRemove)
+{
+  itk::SobelOperator<float, 2> sobelOperator;
+#ifdef ITK_FUTURE_LEGACY_REMOVE
+  EXPECT_FALSE(sobelOperator.IsUsingLegacyCoefficients());
+#else
+  EXPECT_TRUE(sobelOperator.IsUsingLegacyCoefficients());
+#endif
+}
+
+
 // Checks that the coordinates of the kernels have the expected values.
 TEST(SobelOperator, CheckKernelCoordinates)
 {

Modules/Filtering/ImageFeature/include/itkSobelEdgeDetectionImageFilter.h

@@ -135,7 +135,11 @@ class ITK_TEMPLATE_EXPORT SobelEdgeDetectionImageFilter : public ImageToImageFil
   }
 
 private:
+#ifdef ITK_FUTURE_LEGACY_REMOVE
+  bool m_UseLegacyOperatorCoefficients{ false };
+#else
   bool m_UseLegacyOperatorCoefficients{ true };
+#endif
 };
 } // end namespace itk
 

Modules/Filtering/ImageFeature/test/itkSobelEdgeDetectionImageFilterGTest.cxx

@@ -29,11 +29,16 @@
 #include <vector>
 
 
-// Checks that the filter uses legacy Sobel operator coefficients by default.
-TEST(SobelEdgeDetectionImageFilter, UseLegacyOperatorCoefficientsByDefault)
+// Checks that the filter uses legacy Sobel operator coefficients by default, unless ITK_FUTURE_LEGACY_REMOVE is
+// enabled.
+TEST(SobelEdgeDetectionImageFilter, UseLegacyOperatorCoefficientsByDefaultUnlessFutureLegacyRemove)
 {
   const auto filter = itk::SobelEdgeDetectionImageFilter<itk::Image<int>, itk::Image<double>>::New();
+#ifdef ITK_FUTURE_LEGACY_REMOVE
+  EXPECT_FALSE(filter->GetUseLegacyOperatorCoefficients());
+#else
   EXPECT_TRUE(filter->GetUseLegacyOperatorCoefficients());
+#endif
 }
 
 

Modules/Registration/Common/test/itkGradientDifferenceImageToImageMetricGTest.cxx

@@ -137,11 +137,17 @@ TEST(GradientDifferenceImageToImageMetric, Test)
 }
 
 
-TEST(GradientDifferenceImageToImageMetric, IsUsingLegacySobelOperatorCoordinatesByDefault)
+// Checks that the metric uses legacy Sobel operator coefficients by default, unless ITK_FUTURE_LEGACY_REMOVE is
+// enabled.
+TEST(GradientDifferenceImageToImageMetric, IsUsingLegacySobelOperatorCoordinatesByDefaultUnlessFutureLegacyRemove)
 {
   using ImageType = itk::Image<double>;
   const auto metric = itk::GradientDifferenceImageToImageMetric<ImageType, ImageType>::New();
+#ifdef ITK_FUTURE_LEGACY_REMOVE
+  EXPECT_FALSE(metric->IsUsingLegacySobelOperatorCoordinates());
+#else
   EXPECT_TRUE(metric->IsUsingLegacySobelOperatorCoordinates());
+#endif
 }