BUG: Return type for PyBuffer _GetImageViewFromArray with VectorImage

Directly use ImageImageContainer so we can generate a VectorImage.
InsightSoftwareConsortium · Apr 15, 2020 · cd62423 · cd62423
1 parent 5b8473a
commit cd62423
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/Modules/Bridge/NumPy/include/itkPyBuffer.h b/Modules/Bridge/NumPy/include/itkPyBuffer.h
@@ -21,7 +21,6 @@
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
-#include "itkImportImageFilter.h"
 #include "itkDefaultConvertPixelTraits.h"
 
 
@@ -65,7 +64,7 @@ class PyBuffer
   /** Image dimension. */
   static constexpr unsigned int ImageDimension = ImageType::ImageDimension;
 
-  using OutputImagePointer = typename Image<PixelType, ImageDimension>::Pointer;
+  using OutputImagePointer = typename TImage::Pointer;
 
   /**
    * Get an Array with the content of the image buffer

diff --git a/Modules/Bridge/NumPy/include/itkPyBuffer.hxx b/Modules/Bridge/NumPy/include/itkPyBuffer.hxx
@@ -20,6 +20,8 @@
 
 #include "itkPyBuffer.h"
 
+#include "itkImportImageContainer.h"
+
 namespace itk
 {
 
@@ -153,20 +155,19 @@ PyBuffer<TImage>::_GetImageViewFromArray(PyObject * arr, PyObject * shape, PyObj
   SpacingType spacing;
   spacing.Fill(1.0);
 
-  using ImporterType = ImportImageFilter<PixelType, ImageDimension>;
+  using InternalPixelType = typename TImage::InternalPixelType;
+  using ImporterType = ImportImageContainer<SizeValueType, InternalPixelType>;
   typename ImporterType::Pointer importer = ImporterType::New();
-  importer->SetRegion(region);
-  importer->SetOrigin(origin);
-  importer->SetSpacing(spacing);
-  const bool importImageFilterWillOwnTheBuffer = false;
-
-  PixelType * data = (PixelType *)buffer;
-
+  const bool                     importImageFilterWillOwnTheBuffer = false;
+  InternalPixelType *            data = (InternalPixelType *)buffer;
   importer->SetImportPointer(data, numberOfPixels, importImageFilterWillOwnTheBuffer);
 
-  importer->Update();
-  OutputImagePointer output = importer->GetOutput();
-  output->DisconnectPipeline();
+  OutputImagePointer output = TImage::New();
+  output->SetRegions(region);
+  output->SetOrigin(origin);
+  output->SetSpacing(spacing);
+  output->SetPixelContainer(importer);
+  output->SetNumberOfComponentsPerPixel(numberOfComponents);
 
   Py_DECREF(shapeseq);
   PyBuffer_Release(&pyBuffer);