#3121 BBTK Bug New Normal - branch changestoITK3and4

[bbtk.git] / packages / itkvtk / src / bbitkvtkitkImage2vtkImageData.cxx

diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
index 77240acb1fd5dd9dd3406472827166c7fb2f1adc..13dae0557d8a2266dee56d6681bdf7ef2f828406 100644 (file)
--- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
+++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
@@ -45,10 +45,19 @@
 #include "bbitkvtkPackage.h"
 #include "itkImageToVTKImageFilter.h"
 
+
+
+/*
+#EED 2017-08-29 itk3toitk4
+#define BBITKVTK_itkImage2vtkImageData_Template( t, ty, di )            \
+  if( t == typeid( itk::Image< ty, di > ) )                             \
+    this->Convert< itk::Image< ty, di > >( )
+*/
+
 // -------------------------------------------------------------------------
 // LFV: avoid itk::Concept check on 4d or superior images
 #define BBITKVTK_itkImage2vtkImageData_Template( t, ty, di )            \
-  if( t == typeid( itk::Image< ty, di > ) )                             \
+  if( t == typeid( itk::Image< ty, di >* ) )                             \
     this->Convert< itk::Image< ty, di > >( )
 // -------------------------------------------------------------------------
 
@@ -93,7 +102,7 @@ namespace bbitkvtk
     else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned short, 3 );
     else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned int, 3 );
     else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned long, 3 );
-
+       
     /* Deprecated
        BBTK_TEMPLATE_ITK_IMAGE_SWITCH(t,Convert);
     */
@@ -118,9 +127,7 @@ namespace bbitkvtk
        conv = ItkToVtkConnection::New();
        mConverter = conv;
        conv->SetInput( this->bbGetInputIn().get< itkImageTypePointer >() );
-      }
-    else 
-      {
+      } else {
        bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter ok "<<std::endl);
 
        // Input itkImageType type changed ? 
@@ -145,13 +152,10 @@ namespace bbitkvtk
 
            conv->SetInput( this->bbGetInputIn().get<itkImageTypePointer>() );
          }
-       else 
-         {
+       else {
            bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Nothing changed"<<std::endl);
          }
-      }
-    try
-      {
+      } try {
        
        bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Trying update"<<std::endl);  
 
@@ -167,6 +171,7 @@ namespace bbitkvtk
     bbtkDebugMessage("process",5,"<== ["<<bbGetFullName()<<"] : Convert<"
                     <<bbtk::TypeName<T>()
                     <<">() *DONE*"<<std::endl);
+
  }
 
   void itkImage2vtkImageData::bbUserSetDefaultValues()