Skip to content

Commit

Permalink
BUG: expand null pointer checking
Browse files Browse the repository at this point in the history
Extend ResampleVolumeToReferenceVolume to check that input and
reference volumes have transforms defined before trying to use
them.



git-svn-id: http://svn.slicer.org/Slicer4/trunk@24352 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information
naucoin committed Jun 22, 2015
1 parent 298f56b commit b1f2840
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Modules/Loadable/Volumes/Logic/vtkSlicerVolumesLogic.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1481,7 +1481,7 @@ ::ResampleVolumeToReferenceVolume(vtkMRMLVolumeNode* inputVolumeNode,

vtkSmartPointer<vtkMRMLTransformNode> inputVolumeNodeTransformNode = vtkMRMLTransformNode::SafeDownCast(
scene->GetNodeByID(inputVolumeNode->GetTransformNodeID()));
if (inputVolumeNodeTransformNode!=NULL)
if (inputVolumeNodeTransformNode.GetPointer() != NULL)
{
vtkSmartPointer<vtkGeneralTransform> inputVolumeRAS2RAS = vtkSmartPointer<vtkGeneralTransform>::New();
inputVolumeNodeTransformNode->GetTransformToWorld(inputVolumeRAS2RAS);
Expand All @@ -1490,7 +1490,8 @@ ::ResampleVolumeToReferenceVolume(vtkMRMLVolumeNode* inputVolumeNode,

vtkSmartPointer<vtkMRMLTransformNode> referenceVolumeNodeTransformNode = vtkMRMLTransformNode::SafeDownCast(
scene->GetNodeByID(referenceVolumeNode->GetTransformNodeID()));
if (referenceVolumeNodeTransformNode!=NULL)
if (referenceVolumeNodeTransformNode.GetPointer() != NULL &&
inputVolumeNodeTransformNode.GetPointer() != NULL)
{
vtkSmartPointer<vtkGeneralTransform> ras2referenceVolumeRAS = vtkSmartPointer<vtkGeneralTransform>::New();
inputVolumeNodeTransformNode->GetTransformFromWorld(ras2referenceVolumeRAS);
Expand Down

0 comments on commit b1f2840

Please sign in to comment.