BUG: use ITK_NULLPTR instead of identityTransform

romangrothausmann · Feb 5, 2019 · d62cbd4 · d62cbd4
1 parent 9c0b04c
commit d62cbd4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Modules/Core/Common/test/itkImageTest.cxx b/Modules/Core/Common/test/itkImageTest.cxx
@@ -20,7 +20,7 @@
 #include "itkImage.h"
 #include "itkFixedArray.h"
 #include "itkImageAlgorithm.h"
-#include "itkIdentityTransform.h"
+#include "itkTransform.h"
 
 int itkImageTest(int, char* [] )
 {
@@ -123,11 +123,10 @@ int itkImageTest(int, char* [] )
   regionRef.SetSize(sizeRef);
   imageRef->SetRegions(regionRef);
 
-  typedef itk::IdentityTransform< double, Image::ImageDimension > IdentityTransformType;
-  IdentityTransformType* it = IdentityTransformType::New();
+  typedef itk::Transform< double, Image::ImageDimension, Image::ImageDimension > TransformType;
 
   Image::RegionType boxRegion = itk::ImageAlgorithm::EnlargeRegionOverBox(image->GetLargestPossibleRegion(),
-                                                                          it,
+                                                                          static_cast< TransformType *>(ITK_NULLPTR),
                                                                           image.GetPointer(),
                                                                           imageRef.GetPointer());
   Image::IndexType correctIndex; correctIndex.Fill(0);

diff --git a/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.hxx
@@ -27,7 +27,7 @@
 #include "itkProgressReporter.h"
 #include "itkContinuousIndex.h"
 #include "itkMath.h"
-#include "itkIdentityTransform.h"
+#include "itkTransform.h"
 
 namespace itk
 {
@@ -412,11 +412,10 @@ WarpImageFilter< TInputImage, TOutputImage, TDisplacementField >
     else
       {
       using DisplacementRegionType = typename TDisplacementField::RegionType;
-      using IdentityTransformType = itk::IdentityTransform< SpacePrecisionType, OutputImageType::ImageDimension >;
-      IdentityTransformType* it = IdentityTransformType::New();
+      using TransformType = itk::Transform< SpacePrecisionType, OutputImageType::ImageDimension, OutputImageType::ImageDimension >;
 
       DisplacementRegionType fieldRequestedRegion = ImageAlgorithm::EnlargeRegionOverBox(outputPtr->GetRequestedRegion(),
-                                                                                         it,
+                                                                                         static_cast< TransformType *>(ITK_NULLPTR),
                                                                                          outputPtr,
                                                                                          fieldPtr);
       fieldPtr->SetRequestedRegion( fieldRequestedRegion );