X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FDataObjects%2FImage.cxx;h=77e70f664dc7bc5f05270eac371d538253357aba;hb=d8ebffc6ece697ddf7b358946ef5d9c9cd7191fe;hp=60ac5b3a52ed32a777fe99a7ce45c459ed0f701f;hpb=65e11480407fe343b2b56098257e0bb837f75df3;p=cpPlugins.git

diff --git a/lib/cpPlugins/DataObjects/Image.cxx b/lib/cpPlugins/DataObjects/Image.cxx
index 60ac5b3..77e70f6 100644
--- a/lib/cpPlugins/DataObjects/Image.cxx
+++ b/lib/cpPlugins/DataObjects/Image.cxx
@@ -16,8 +16,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;
@@ -43,37 +43,37 @@ SetVTK( vtkObjectBase* o )
 
   bool success = false;
   auto stype = img->GetScalarType( );
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_char 
+#ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
   if( stype == VTK_CHAR ) success = this->_VTK_2_ITK_0< char >( img );
   if( stype == VTK_UNSIGNED_CHAR ) success = this->_VTK_2_ITK_0< unsigned char >( img );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_char 
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_short 
+#endif // cpPlugins_CONFIG_INTEGER_TYPES_char
+#ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
   if( stype == VTK_CHAR ) success = this->_VTK_2_ITK_0< short >( img );
   if( stype == VTK_UNSIGNED_CHAR ) success = this->_VTK_2_ITK_0< unsigned short >( img );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_short 
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_int 
+#endif // cpPlugins_CONFIG_INTEGER_TYPES_short
+#ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
   if( stype == VTK_CHAR ) success = this->_VTK_2_ITK_0< int >( img );
   if( stype == VTK_UNSIGNED_CHAR ) success = this->_VTK_2_ITK_0< unsigned int >( img );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_int 
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_long 
+#endif // cpPlugins_CONFIG_INTEGER_TYPES_int
+#ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
   if( stype == VTK_CHAR ) success = this->_VTK_2_ITK_0< long >( img );
   if( stype == VTK_UNSIGNED_CHAR ) success = this->_VTK_2_ITK_0< unsigned long >( img );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_long 
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float 
+#endif // cpPlugins_CONFIG_INTEGER_TYPES_long
+#ifdef cpPlugins_CONFIG_REAL_TYPES_float
   if( stype == VTK_CHAR ) success = this->_VTK_2_ITK_0< float >( img );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float 
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double 
+#endif // cpPlugins_CONFIG_REAL_TYPES_float
+#ifdef cpPlugins_CONFIG_REAL_TYPES_double
   if( stype == VTK_CHAR ) success = this->_VTK_2_ITK_0< double >( img );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double 
+#endif // cpPlugins_CONFIG_REAL_TYPES_double
   /* TODO
-     #define cpPlugins_CONFIG_COLOR_PIXELS_RGBPixel 
-     #define cpPlugins_CONFIG_COLOR_PIXELS_RGBAPixel 
-     #define cpPlugins_CONFIG_VECTORS_CovariantVector 
-     #define cpPlugins_CONFIG_VECTORS_Point 
-     #define cpPlugins_CONFIG_VECTORS_SymmetricSecondRankTensor 
-     #define cpPlugins_CONFIG_VECTORS_Vector 
-     #define cpPlugins_CONFIG_DIFFUSIONTENSORS_DiffusionTensor3D 
-     #define cpPlugins_CONFIG_MATRICES_Matrix 
+     #define cpPlugins_CONFIG_COLOR_PIXELS_RGBPixel
+     #define cpPlugins_CONFIG_COLOR_PIXELS_RGBAPixel
+     #define cpPlugins_CONFIG_VECTORS_CovariantVector
+     #define cpPlugins_CONFIG_VECTORS_Point
+     #define cpPlugins_CONFIG_VECTORS_SymmetricSecondRankTensor
+     #define cpPlugins_CONFIG_VECTORS_Vector
+     #define cpPlugins_CONFIG_DIFFUSIONTENSORS_DiffusionTensor3D
+     #define cpPlugins_CONFIG_MATRICES_Matrix
   */
   if( !success )
   {
@@ -102,9 +102,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;