Fixed #583 - Support strided numpy arrays

emcconville · Jul 19, 2022 · 5e3ffb3 · 5e3ffb3
1 parent be40bfc
commit 5e3ffb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -15,6 +15,7 @@ Version 0.6.9
 Unreleased.
 
  - Updated :meth:`Image.fx() <wand.image.BaseImage.fx>` method to raise :class:`~wand.exceptions.WandRuntimeError` if ImageMagick is unable to generate an image. [:issue:`582`]
+ - Fixed :meth:`Image.from_array() <wand.image.Image.from_array>` classmethod to handle Numpy's strided arrays. [:issue:`582`]
 
 
 .. _changelog-0.6.8:

diff --git a/wand/image.py b/wand/image.py
@@ -9513,7 +9513,8 @@ def from_array(cls, array, channel_map=None, storage=None):
                     channel_map = 'CMYKA'[0:shape[2]]
             else:
                 channel_map = 'R'
-        if hasattr(array, 'ctypes'):
+        strides = arr_itr.get('strides', None)
+        if hasattr(array, 'ctypes') and strides is None:
             data_ptr = array.ctypes.data_as(ctypes.c_void_p)
         elif hasattr(array, 'tobytes'):
             data_ptr = array.tobytes()