Cast image filter added. ROI filter modified.

[cpPlugins.git] / lib / cpPlugins / BaseObjects / DataObject.cxx

diff --git a/lib/cpPlugins/BaseObjects/DataObject.cxx b/lib/cpPlugins/BaseObjects/DataObject.cxx
index aeb24cd95090d399e4143c91a39d08de5d76f90a..fde94b54c1e099687491164a25dff5a8a9778d46 100644 (file)
--- a/lib/cpPlugins/BaseObjects/DataObject.cxx
+++ b/lib/cpPlugins/BaseObjects/DataObject.cxx
@@ -45,13 +45,12 @@ void cpPlugins::BaseObjects::DataObject::
 DisconnectFromPipeline( )
 {
   // Disconnect input pipelines (ITK)
-  itk::DataObject* itk_obj = this->GetITK< itk::DataObject >( );
-  if( itk_obj != NULL )
+  itk::DataObject::Pointer itk_obj = this->GetITK< itk::DataObject >( );
+  if( itk_obj.IsNotNull( ) )
     itk_obj->DisconnectPipeline( );
 
   // Disconnect input pipelines (VTK)
   bool      ok = this->_DisconnectVTK< vtkImageData >( );
-  if( !ok ) ok = this->_DisconnectVTK< vtkUnstructuredGrid >( );
   if( !ok ) ok = this->_DisconnectVTK< vtkPolyData >( );
 
   // Unbind source
@@ -78,7 +77,7 @@ template< class _TType >
 bool cpPlugins::BaseObjects::DataObject::
 _DisconnectVTK( )
 {
-  _TType* v = this->GetVTK< _TType >( );
+  _TType* v = dynamic_cast< _TType* >( this->m_VTK.GetPointer( ) );
   if( v != NULL )
   {
     vtkSmartPointer< _TType > d = vtkSmartPointer< _TType >::New( );