Merge pull request #147 from SuperElastix/Replace-ImageMaskSpatialObj…

…ect2

ENH: Replace elastix ImageSpatialObject2 by ITK ImageSpatialObject

Common/CMakeLists.txt

@@ -34,10 +34,6 @@ set( CommonFiles
   itkGenericMultiResolutionPyramidImageFilter.hxx
   itkImageFileCastWriter.h
   itkImageFileCastWriter.hxx
-  itkImageMaskSpatialObject2.h
-  itkImageMaskSpatialObject2.hxx
-  itkImageSpatialObject2.h
-  itkImageSpatialObject2.hxx
   itkMeshFileReaderBase.h
   itkMeshFileReaderBase.hxx
   itkMultiOrderBSplineDecompositionImageFilter.h

Common/CostFunctions/itkAdvancedImageToImageMetric.h

@@ -30,7 +30,7 @@
 #include "itkAdvancedTransform.h"
 #include "vnl/vnl_sparse_matrix.h"
 
-#include "itkImageMaskSpatialObject2.h"
+#include "itkImageMaskSpatialObject.h"
 
 // Needed for checking for B-spline for faster implementation
 #include "itkAdvancedBSplineDeformableTransform.h"
@@ -131,8 +131,8 @@ class AdvancedImageToImageMetric :
   typedef typename DerivativeType::ValueType                DerivativeValueType;
   typedef typename Superclass::ParametersType               ParametersType;
 
-  typedef ImageMaskSpatialObject2< itkGetStaticConstMacro( FixedImageDimension ) > FixedImageMaskSpatialObject2Type;
-  typedef ImageMaskSpatialObject2< itkGetStaticConstMacro( MovingImageDimension ) > MovingImageMaskSpatialObject2Type;
+  typedef ImageMaskSpatialObject< itkGetStaticConstMacro( FixedImageDimension ) > FixedImageMaskSpatialObject2Type;
+  typedef ImageMaskSpatialObject< itkGetStaticConstMacro( MovingImageDimension ) > MovingImageMaskSpatialObject2Type;
 
   /** Some useful extra typedefs. */
   typedef typename FixedImageType::PixelType               FixedImagePixelType;

Common/GTesting/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_executable(CommonGTest
   itkComputeImageExtremaFilterGTest.cxx
-  itkImageMaskSpatialObject2GTest.cxx
   )
 target_link_libraries(CommonGTest
   GTest::GTest GTest::Main

Common/ImageSamplers/itkImageSamplerBase.hxx

@@ -351,7 +351,11 @@ ImageSamplerBase< TInputImage >
 
     typedef typename MaskType::BoundingBoxType        BoundingBoxType;
     typedef typename BoundingBoxType::PointsContainer PointsContainerType;
+#if ITK_VERSION_MAJOR < 5
     typename BoundingBoxType::Pointer bb      = this->m_Mask->GetBoundingBox();
+#else
+    typename BoundingBoxType::ConstPointer bb = this->m_Mask->GetMyBoundingBoxInWorldSpace();
+#endif
     typename BoundingBoxType::Pointer bbIndex = BoundingBoxType::New();
     const PointsContainerType * cornersWorld = bb->GetPoints();
     typename PointsContainerType::Pointer cornersIndex = PointsContainerType::New();

Common/itkComputeImageExtremaFilter.h

@@ -20,7 +20,7 @@
 
 #include "itkStatisticsImageFilter.h"
 #include "itkSpatialObject.h"
-#include "itkImageMaskSpatialObject2.h"
+#include "itkImageMaskSpatialObject.h"
 
 namespace itk
 {
@@ -86,7 +86,7 @@ class ComputeImageExtremaFilter :
   itkSetConstObjectMacro( ImageMask, ImageMaskType );
   itkGetConstObjectMacro( ImageMask, ImageMaskType );
 
-  typedef ImageMaskSpatialObject2< itkGetStaticConstMacro(ImageDimension) > ImageSpatialMaskType;
+  typedef ImageMaskSpatialObject< itkGetStaticConstMacro(ImageDimension) > ImageSpatialMaskType;
   typedef typename ImageSpatialMaskType::Pointer ImageSpatialMaskPointer;
   typedef typename ImageSpatialMaskType::ConstPointer ImageSpatialMaskConstPointer;
   itkSetConstObjectMacro( ImageSpatialMask, ImageSpatialMaskType );