From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Thu, 16 Jun 2011 13:38:49 +0000 (+0000)
Subject: Fix mistyping
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=19bbb0558fc5368833b085664291363e5985b023;p=bbtk.git

Fix mistyping
---

diff --git a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx
index ceee695..0a23b76 100644
--- a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx
+++ b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkvtkImageData2itkImage.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/06/16 12:28:57 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2011/06/16 13:38:49 $
+  Version:   $Revision: 1.7 $
 
 =========================================================================*/
 
@@ -70,8 +70,8 @@ namespace bbitkvtk
   BBTK_TEMPLATE_VTK_IMAGE_DATA_SWITCH_DIM(I,3,M)
 
   void vtkImageData2itkImage::Convert()
-  {   
-    BBTK_TEMPLATE_VTK_IMAGE_DATA_SWITCH(bbGetInputIn(),Convert)
+  {
+     BBTK_TEMPLATE_VTK_IMAGE_DATA_SWITCH(bbGetInputIn(),Convert)
   }
 
 
@@ -141,7 +141,7 @@ namespace bbitkvtk
     bbtkDebugMessage("process",5,"<== ["<<bbGetFullName()<<"] : Convert<"
 		     <<bbtk::TypeName<T>()<<","<<D
 		     <<">() *DONE*"<<std::endl);
- }
+}
 
 
   void vtkImageData2itkImage::bbUserSetDefaultValues()
diff --git a/packages/itkvtk/src/bbitkvtkvtkImageDataVector2itkImageVector.cxx b/packages/itkvtk/src/bbitkvtkvtkImageDataVector2itkImageVector.cxx
index 678d43c..e51c2b7 100644
--- a/packages/itkvtk/src/bbitkvtkvtkImageDataVector2itkImageVector.cxx
+++ b/packages/itkvtk/src/bbitkvtkvtkImageDataVector2itkImageVector.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkvtkImageDataVector2itkImageVector.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/06/16 12:28:57 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2011/06/16 13:38:49 $
+  Version:   $Revision: 1.2 $
 
 =========================================================================*/
 
@@ -49,20 +49,21 @@ namespace bbitkvtk
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itkvtk,vtkImageDataVector2itkImageVector);
 
-#define BBTK_TEMPLATE_VTK_IMAGE_DATA_SWITCH_DIM(I,DIM,M)                        \
-  if (I->GetDataDimension()==DIM)                                               \
-    {                                                                           \
-      if      (I->GetScalarType()==VTK_CHAR) M<char,DIM>();                     \
-      else if (I->GetScalarType()==VTK_SIGNED_CHAR) M<signed char,DIM>();       \
-      else if (I->GetScalarType()==VTK_UNSIGNED_CHAR) M<unsigned char,DIM>();   \
-      else if (I->GetScalarType()==VTK_SHORT) M<short,DIM>();                   \
-      else if (I->GetScalarType()==VTK_UNSIGNED_SHORT) M<unsigned short,DIM>(); \
-      else if (I->GetScalarType()==VTK_INT) M<int,DIM>();                       \
-      else if (I->GetScalarType()==VTK_UNSIGNED_INT) M<unsigned int,DIM>();     \
-      else if (I->GetScalarType()==VTK_LONG) M<long,DIM>();                     \
-      else if (I->GetScalarType()==VTK_UNSIGNED_LONG) M<unsigned long,DIM>();   \
-      else if (I->GetScalarType()==VTK_FLOAT) M<float,DIM>();                   \
-      else if (I->GetScalarType()==VTK_DOUBLE) M<double,DIM>();                 \
+// we assume all the vector elements have the same type
+#define BBTK_TEMPLATE_VTK_IMAGE_DATA_SWITCH_DIM(I,DIM,M)                           \
+  if (I[0]->GetDataDimension()==DIM)                                               \
+    {                                                                              \
+      if      (I[0]->GetScalarType()==VTK_CHAR) M<char,DIM>();                     \
+      else if (I[0]->GetScalarType()==VTK_SIGNED_CHAR) M<signed char,DIM>();       \
+      else if (I[0]->GetScalarType()==VTK_UNSIGNED_CHAR) M<unsigned char,DIM>();   \
+      else if (I[0]->GetScalarType()==VTK_SHORT) M<short,DIM>();                   \
+      else if (I[0]->GetScalarType()==VTK_UNSIGNED_SHORT) M<unsigned short,DIM>(); \
+      else if (I[0]->GetScalarType()==VTK_INT) M<int,DIM>();                       \
+      else if (I[0]->GetScalarType()==VTK_UNSIGNED_INT) M<unsigned int,DIM>();     \
+      else if (I[0]->GetScalarType()==VTK_LONG) M<long,DIM>();                     \
+      else if (I[0]->GetScalarType()==VTK_UNSIGNED_LONG) M<unsigned long,DIM>();   \
+      else if (I[0]->GetScalarType()==VTK_FLOAT) M<float,DIM>();                   \
+      else if (I[0]->GetScalarType()==VTK_DOUBLE) M<double,DIM>();                 \
     }
 
 #define BBTK_TEMPLATE_VTK_IMAGE_DATA_SWITCH(I,M) \
@@ -135,7 +136,7 @@ namespace bbitkvtk
 	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Trying update"<<std::endl);	 
 	conv->Update();
 	itkImageType* out = const_cast<itkImageType*>(conv->GetOutput());
-	m_Output_Vector.push_back(conv->GetOutput());	
+	m_Output_Vector.push_back(out);
 
       }
     catch( itk::ExceptionObject & e)