ENH: WIP: Wrap CastImageFilter for VectorImage <-> Vector

Author: thewtex

Modules/Core/Common/wrapping/itkImageToImageFilterA.wrap

@@ -15,6 +15,16 @@ itk_wrap_class("itk::ImageToImageFilter" POINTER)
   # Vector types
   itk_wrap_image_filter_combinations("${WRAP_ITK_VECTOR}" "${WRAP_ITK_VECTOR}")
 
+  # VectorImage <-> vector
+  foreach(d ${ITK_WRAP_IMAGE_DIMS})
+    if(ITK_WRAP_vector_float)
+      itk_wrap_template("${ITKM_IVF${d}${d}}${ITKM_VIF${d}}" "${ITKT_IVF${d}${d}},${ITKT_VIF${d}}")
+    endif()
+    if(ITK_WRAP_vector_double)
+      itk_wrap_template("${ITKM_IVD${d}${d}}${ITKM_VID${d}}" "${ITKT_IVD${d}${d}},${ITKT_VID${d}}")
+    endif()
+  endforeach()
+
   # For GradientRecursiveGaussianImageFilter we need some specific combinations
   foreach(image_dim ${ITK_WRAP_IMAGE_DIMS})
     foreach(input_vector_dim ${ITK_WRAP_VECTOR_COMPONENTS})

Modules/Filtering/ImageFilterBase/include/itkCastImageFilter.hxx

@@ -120,7 +120,6 @@ CastImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateDataDispatche
   // Implementation for non-implicit convertible pixels which are
   // itk-array-like.
 
-  static_assert(OutputPixelType::Dimension == InputPixelType::Dimension, "Vector dimensions are required to match!");
   static_assert(std::is_convertible<typename InputPixelType::ValueType, typename OutputPixelType::ValueType>::value,
                 "Component types are required to be convertible.");
 
@@ -140,6 +139,8 @@ CastImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateDataDispatche
 
   this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
 
+  const unsigned int componentsPerPixel = outputPtr->GetNumberOfComponentsPerPixel();
+
   // Define the iterators
   ImageScanlineConstIterator<TInputImage> inputIt(inputPtr, inputRegionForThread);
   ImageScanlineIterator<TOutputImage>     outputIt(outputPtr, outputRegionForThread);
@@ -152,7 +153,7 @@ CastImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateDataDispatche
     {
       const InputPixelType & inputPixel = inputIt.Get();
       OutputPixelType        value;
-      for (unsigned int k = 0; k < OutputPixelType::Dimension; k++)
+      for (unsigned int k = 0; k < componentsPerPixel; k++)
       {
         value[k] = static_cast<typename OutputPixelType::ValueType>(inputPixel[k]);
       }

Modules/Filtering/ImageFilterBase/wrapping/itkCastImageFilter.wrap

@@ -8,6 +8,16 @@ itk_wrap_class("itk::CastImageFilter" POINTER_WITH_SUPERCLASS)
   # vector <-> vector
   itk_wrap_image_filter_combinations("${WRAP_ITK_VECTOR}" "${WRAP_ITK_VECTOR}")
 
+  # VectorImage <-> vector
+  foreach(d ${ITK_WRAP_IMAGE_DIMS})
+    if(ITK_WRAP_vector_float)
+      itk_wrap_template("${ITKM_IVF${d}${d}}${ITKM_VIF${d}}" "${ITKT_IVF${d}${d}},${ITKT_VIF${d}}")
+    endif()
+    if(ITK_WRAP_vector_double)
+      itk_wrap_template("${ITKM_IVD${d}${d}}${ITKM_VID${d}}" "${ITKT_IVD${d}${d}},${ITKT_VID${d}}")
+    endif()
+  endforeach()
+
   # RGB <-> RGB
   UNIQUE(rgb "RGBUC;${WRAP_ITK_RGB}")
   itk_wrap_image_filter_combinations("${rgb}" "${rgb}")

Modules/Filtering/ImageFilterBase/wrapping/test/CastImageFilterTest.py

@@ -25,11 +25,11 @@
 itk.auto_progress(2)
 
 dim = 2
-IType = itk.Image[itk.F, dim]
-OIType = itk.Image[itk.UC, dim]
+InputImageType = itk.Image[itk.F, dim]
+OutputImageType = itk.Image[itk.UC, dim]
 
-reader = itk.ImageFileReader[IType].New(FileName=argv[1])
-filter = itk.CastImageFilter[IType, OIType].New(reader)
-writer = itk.ImageFileWriter[OIType].New(filter, FileName=argv[2])
+reader = itk.ImageFileReader[InputImageType].New(FileName=argv[1])
+filt = itk.CastImageFilter[InputImageType, OutputImageType].New(reader)
+writer = itk.ImageFileWriter[OutputImageType].New(filt, FileName=argv[2])
 
 writer.Update()