...

[cpPlugins.git] / lib / cpPlugins / Image.hxx

diff --git a/lib/cpPlugins/Image.hxx b/lib/cpPlugins/Image.hxx
index d0f3de410fcf83c04a5db04172730b7b9530bb1a..19dbcdabe290901dcebb5069c075b2e53e127c06 100644 (file)
--- a/lib/cpPlugins/Image.hxx
+++ b/lib/cpPlugins/Image.hxx
@@ -117,8 +117,8 @@ _ITK_2_VTK_2( itk::LightObject* o )
     this->F( dynamic_cast< itk::Image< itk::C##Pixel< P >, D >* >( I ) )
 
 #define cpPlugins_Image_Demangle_VectorPixel_Dim( F, I, V, P, D )       \
-  if( dynamic_cast< itk::Image< V< P, D >, D >* >( I ) != NULL )        \
-    this->F( dynamic_cast< itk::Image< V< P, D >, D >* >( I ) )
+  if( dynamic_cast< itk::Image< itk::V< P, D >, D >* >( I ) != NULL )   \
+    this->F( dynamic_cast< itk::Image< itk::V< P, D >, D >* >( I ) )
 
 #define cpPlugins_Image_Demangle_Pixel_AllInts( F, I, D )               \
   cpPlugins_Image_Demangle_Pixel_Dim     ( F, I, char, D );             \
@@ -136,10 +136,10 @@ _ITK_2_VTK_2( itk::LightObject* o )
   cpPlugins_Image_Demangle_Pixel_Dim     ( F, I, float, D );            \
   else cpPlugins_Image_Demangle_Pixel_Dim( F, I, double, D )
 
-#define cpPlugins_Image_Demangle_Pixel_AllScalars( F, I, D )  \
-  cpPlugins_Image_Demangle_Pixel_AllInts      ( F, I, D );    \
-  else cpPlugins_Image_Demangle_Pixel_AllUInts( F, I, D );    \
-  else cpPlugins_Image_Demangle_Pixel_AllInts ( F, I, D )
+#define cpPlugins_Image_Demangle_Pixel_AllScalars( F, I, D )   \
+  cpPlugins_Image_Demangle_Pixel_AllInts       ( F, I, D );    \
+  else cpPlugins_Image_Demangle_Pixel_AllUInts ( F, I, D );    \
+  else cpPlugins_Image_Demangle_Pixel_AllFloats( F, I, D )
 
 #define cpPlugins_Image_Demangle_ColorPixel_AllInts( F, I, C, D )       \
   cpPlugins_Image_Demangle_ColorPixel_Dim     ( F, I, C, char, D );     \
@@ -158,12 +158,16 @@ _ITK_2_VTK_2( itk::LightObject* o )
   else cpPlugins_Image_Demangle_ColorPixel_Dim( F, I, C, double, D )
 
 #define cpPlugins_Image_Demangle_ColorPixel_AllScalars( F, I, C, D )    \
-  cpPlugins_Image_Demangle_ColorPixel_AllInts      ( F, I, C, D );      \
-  else cpPlugins_Image_Demangle_ColorPixel_AllUInts( F, I, C, D );      \
-  else cpPlugins_Image_Demangle_ColorPixel_AllInts ( F, I, C, D )
+  cpPlugins_Image_Demangle_ColorPixel_AllInts       ( F, I, C, D );     \
+  else cpPlugins_Image_Demangle_ColorPixel_AllUInts ( F, I, C, D );     \
+  else cpPlugins_Image_Demangle_ColorPixel_AllFloats( F, I, C, D )
+
+#define cpPlugins_Image_Demangle_VectorPixel_AllFloats( F, I, V, D )    \
+  cpPlugins_Image_Demangle_VectorPixel_Dim     ( F, I, V, float, D );   \
+  else cpPlugins_Image_Demangle_VectorPixel_Dim( F, I, V, double, D )
 
 /* TODO
-   #define cpPlugins_Image_Demangle_Pixel_AllColor( r, FUNC, INPUT, D ) \
+   #define cpPlugins_Image_Demangle_Pixel_AllVector( r, FUNC, INPUT, D ) \
    r = cpPlugins_Image_Demangle_Pixel_Dim( FUNC, INPUT, itk::RGBPixel< char >, D ); \
    if( r != "" ) r = cpPlugins_Image_Demangle_Pixel_Dim( FUNC, INPUT, itk::RGBPixel< short >, D ); \
    if( r != "" ) r = cpPlugins_Image_Demangle_Pixel_Dim( FUNC, INPUT, itk::RGBPixel< int >, D ); \