...

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

diff --git a/lib/cpPlugins/DataObjects/Image.cxx b/lib/cpPlugins/DataObjects/Image.cxx
index 8378b402e94f0d4f70768aadcd734e6a4e845a0f..5453dce056604746f2d5bfd4cde3c78c99e072a0 100644 (file)
--- a/lib/cpPlugins/DataObjects/Image.cxx
+++ b/lib/cpPlugins/DataObjects/Image.cxx
@@ -1,7 +1,5 @@
 #include <cpPlugins/DataObjects/Image.h>
 #include <cpPlugins/DataObjects/Image_Demanglers.h>
-#include <cpInstances_BaseObjects.h>
-#include <cpInstances_SimpleImages.h>
 
 #include <itkImageToVTKImageFilter.h>
 #include <itkVTKImageToImageFilter.h>
@@ -16,8 +14,8 @@ void cpPlugins::DataObjects::Image::
 SetITK( itk::LightObject* o )
 {
   this->Superclass::SetITK( o );
-  cpPlugins_Demangle_Image_VisualDims( o, _ITK_2_VTK_0, )
-    cpPlugins_Demangle_Image_DiffTensors3D( o, _ITK_2_VTK_1, )
+  cpPlugins_Demangle_Image_VisualDims_1( o, _ITK_2_VTK_0 )
+    cpPlugins_Demangle_Image_DiffTensors3D_1( o, _ITK_2_VTK_1 )
   {
     this->m_VTK = NULL;
     this->m_ITKvVTK = NULL;
@@ -102,9 +100,9 @@ template< class _TImage >
 void cpPlugins::DataObjects::Image::
 _ITK_2_VTK_0( _TImage* image )
 {
-  cpPlugins_Demangle_Image_ScalarPixels( image, _ITK_2_VTK_1, _TImage::ImageDimension, )
-    cpPlugins_Demangle_Image_ColorPixels( image, _ITK_2_VTK_1, _TImage::ImageDimension, )
-    cpPlugins_Demangle_Image_VectorPixels( image, _ITK_2_VTK_1, _TImage::ImageDimension, )
+  cpPlugins_Demangle_Image_ScalarPixels_1( image, _ITK_2_VTK_1, _TImage::ImageDimension )
+    cpPlugins_Demangle_Image_ColorPixels_1( image, _ITK_2_VTK_1, _TImage::ImageDimension )
+    cpPlugins_Demangle_Image_VectorPixels_1( image, _ITK_2_VTK_1, _TImage::ImageDimension )
   {
     this->m_VTK = NULL;
     this->m_ITKvVTK = NULL;