X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FImage.h;h=a5beda39b58b59c7e3424a435f1cdbb9c1cafb7a;hb=75dc4945344b4a5a7be10a3ca33fa2e6fff87df8;hp=04d9507a1e1107bca513819c4fdd125cba8df400;hpb=9015cf98c60cf4ab304a639990004ee783a8bec0;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/Image.h b/lib/cpPlugins/Interface/Image.h
index 04d9507..a5beda3 100644
--- a/lib/cpPlugins/Interface/Image.h
+++ b/lib/cpPlugins/Interface/Image.h
@@ -1,16 +1,14 @@
 #ifndef __CPPLUGINS__INTERFACE__IMAGE__H__
 #define __CPPLUGINS__INTERFACE__IMAGE__H__
 
-#include <map>
-#include <string>
 #include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
-#define ITK_MANUAL_INSTANTIATION
 #include <itkProcessObject.h>
 
 class vtkImageData;
 
+// -------------------------------------------------------------------------
 namespace cpPlugins
 {
   namespace Interface
@@ -31,9 +29,16 @@ namespace cpPlugins
       itkTypeMacro( Image, DataObject );
 
     public:
-      virtual void SetITKDataObject( itk::DataObject* o );
-      virtual void SetVTKDataObject( vtkDataObject* o );
+      template< class I >
+        inline void SetITKImage( itk::DataObject* object );
 
+      template< class I >
+        inline I* GetITKImage( );
+
+      template< class I >
+        inline const I* GetITKImage( ) const;
+
+      virtual void SetVTKImageData( vtkImageData* image );
       virtual vtkImageData* GetVTKImageData( );
       virtual const vtkImageData* GetVTKImageData( ) const;
 
@@ -41,11 +46,8 @@ namespace cpPlugins
       Image( );
       virtual ~Image( );
 
-      template< unsigned int D >
-        void _ITK_2_VTK_0( itk::DataObject* o );
-
       template< class P, unsigned int D >
-        void _ITK_2_VTK_1( itk::DataObject* o );
+        inline void _ITK_2_VTK( itk::DataObject* object );
 
     private:
       // Purposely not implemented
@@ -60,6 +62,8 @@ namespace cpPlugins
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Image.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__IMAGE__H__
 
 // eof - $RCSfile$