...

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

diff --git a/lib/cpPlugins/DataObjects/Image.h b/lib/cpPlugins/DataObjects/Image.h
index bfe1d679281b810583ff8435b8a66a32b222e08e..238135fdf8933191f848042a48aa5a0515852f90 100644 (file)
--- a/lib/cpPlugins/DataObjects/Image.h
+++ b/lib/cpPlugins/DataObjects/Image.h
@@ -2,8 +2,8 @@
 #define __cpPlugins__DataObjects__Image__h__
 
 #include <cpPlugins/BaseObjects/DataObject.h>
+#include <cpPlugins/DataObjects/Image_Demanglers.h>
 #include <itkProcessObject.h>
-#include <cpPlugins_Images.h>
 
 namespace cpPlugins
 {
@@ -34,17 +34,17 @@ namespace cpPlugins
       Image( );
       virtual ~Image( );
 
-      template< unsigned int _VDim >
-        inline void _ITK_2_VTK_0( itk::ImageBase< _VDim >* image );
+      template< class _TImage >
+      inline void _ITK_2_VTK_0( _TImage* image );
 
       template< class _TImage >
-        inline void _ITK_2_VTK_1( _TImage* image );
+      inline void _ITK_2_VTK_1( _TImage* image );
 
       template< class _TPixel >
-        inline void _VTK_2_ITK_0( vtkImageData* image );
+      inline bool _VTK_2_ITK_0( vtkImageData* image );
 
       template< class _TPixel, unsigned int _VDim >
-        inline void _VTK_2_ITK_1( vtkImageData* image );
+      inline bool _VTK_2_ITK_1( vtkImageData* image );
 
     private:
       // Purposely not implemented
@@ -59,8 +59,6 @@ namespace cpPlugins
 
 } // ecapseman
 
-#include <cpPlugins/BaseObjects/Demangle.h>
-
 #endif // __cpPlugins__DataObjects__Image__h__
 
 // eof - $RCSfile$