...

[cpPlugins.git] / lib / cpPlugins / Interface / Image.h

diff --git a/lib/cpPlugins/Interface/Image.h b/lib/cpPlugins/Interface/Image.h
index 1aeee5cc18a7b6945951fcbf7d692d1748318b70..88808c4a59c7e360ece328eb27a23fc050356b9c 100644 (file)
--- a/lib/cpPlugins/Interface/Image.h
+++ b/lib/cpPlugins/Interface/Image.h
@@ -1,14 +1,10 @@
 #ifndef __CPPLUGINS__INTERFACE__IMAGE__H__
 #define __CPPLUGINS__INTERFACE__IMAGE__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
 #include <itkProcessObject.h>
 
-class vtkImageData;
-
-// -------------------------------------------------------------------------
 namespace cpPlugins
 {
   namespace Interface
@@ -27,22 +23,24 @@ namespace cpPlugins
     public:
       itkNewMacro( Self );
       itkTypeMacro( Image, DataObject );
-      cpPlugins_Id_Macro(
-        cpPlugins::Interface::Image, "DataObject"
-        );
+      cpPlugins_Id_Macro( Image, DataObject );
 
     public:
-      template< class I >
-        inline void SetITK( itk::Object* object );
-
-      virtual void SetVTK( vtkObject* image );
+      virtual void SetITK( itk::LightObject* o );
+      virtual void SetVTK( vtkObjectBase* o );
 
     protected:
       Image( );
       virtual ~Image( );
 
+      template< unsigned int D >
+        inline bool _ITK_2_VTK_0( itk::LightObject* o );
+
       template< class P, unsigned int D >
-        inline void _ITK_2_VTK( itk::Object* object );
+        inline bool _ITK_2_VTK_1( itk::LightObject* o );
+
+      template< class I >
+        inline bool _ITK_2_VTK_2( itk::LightObject* o );
 
     private:
       // Purposely not implemented
@@ -50,7 +48,7 @@ namespace cpPlugins
       Self& operator=( const Self& );
 
     protected:
-      itk::ProcessObject::Pointer m_ITKvVTKConnection;
+      itk::ProcessObject::Pointer m_ITKvVTK;
     };
 
   } // ecapseman