Removed conversion to array in Buffer.

Author: jeromekelleher

numcodecs/blosc.c

@@ -366,7 +366,8 @@ def decompress(source, dest=None):
         dest_ptr = PyBytes_AS_STRING(dest)
         dest_nbytes = nbytes
     else:
-        dest_buffer = Buffer(dest, PyBUF_ANY_CONTIGUOUS | PyBUF_WRITEABLE)
+        arr = ensure_contiguous_ndarray(dest)
+        dest_buffer = Buffer(arr, PyBUF_ANY_CONTIGUOUS | PyBUF_WRITEABLE)
         dest_ptr = dest_buffer.ptr
         dest_nbytes = dest_buffer.nbytes
 

numcodecs/blosc.pyx

@@ -16,8 +16,7 @@ cdef class Buffer:
     new-style buffer interface in PY2."""
 
     def __cinit__(self, obj, flags):
-        arr = ensure_contiguous_ndarray(obj)
-        PyObject_GetBuffer(arr, &(self.buffer), flags)
+        PyObject_GetBuffer(obj, &(self.buffer), flags)
         self.acquired = True
         self.ptr = <char *> self.buffer.buf
         self.itemsize = self.buffer.itemsize

numcodecs/compat_ext.c

@@ -167,7 +167,8 @@ def decompress(source, dest=None):
             dest = PyBytes_FromStringAndSize(NULL, dest_size)
             dest_ptr = PyBytes_AS_STRING(dest)
         else:
-            dest_buffer = Buffer(dest, PyBUF_ANY_CONTIGUOUS | PyBUF_WRITEABLE)
+            arr = ensure_contiguous_ndarray(dest)
+            dest_buffer = Buffer(arr, PyBUF_ANY_CONTIGUOUS | PyBUF_WRITEABLE)
             dest_ptr = dest_buffer.ptr
             if dest_buffer.nbytes < dest_size:
                 raise ValueError('destination buffer too small; expected at least %s, '

numcodecs/compat_ext.pyx

@@ -13,6 +13,7 @@ from cpython.bytes cimport PyBytes_FromStringAndSize, PyBytes_AS_STRING
 
 from .compat_ext cimport Buffer
 from .compat_ext import Buffer
+from .compat import ensure_contiguous_ndarray
 from .abc import Codec
 
 
@@ -159,7 +160,8 @@ def decompress(source, dest=None):
             dest = PyBytes_FromStringAndSize(NULL, dest_size)
             dest_ptr = PyBytes_AS_STRING(dest)
         else:
-            dest_buffer = Buffer(dest, PyBUF_ANY_CONTIGUOUS | PyBUF_WRITEABLE)
+            arr = ensure_contiguous_ndarray(dest)
+            dest_buffer = Buffer(arr, PyBUF_ANY_CONTIGUOUS | PyBUF_WRITEABLE)
             dest_ptr = dest_buffer.ptr
             if dest_buffer.nbytes < dest_size:
                 raise ValueError('destination buffer too small; expected at least %s, '
@@ -202,14 +204,20 @@ class Zstd(Codec):
     """
 
     codec_id = 'zstd'
+    
+    # Note: unlike the LZ4 and Blosc codecs, there does not appear to be a (currently)
+    # practical limit on the size of buffers that Zstd can process and so we don't 
+    # enforce a max_buffer_size option here.
 
     def __init__(self, level=DEFAULT_CLEVEL):
         self.level = level
 
     def encode(self, buf):
+        buf = ensure_contiguous_ndarray(buf)
         return compress(buf, self.level)
 
     def decode(self, buf, out=None):
+        buf = ensure_contiguous_ndarray(buf)
         return decompress(buf, out)
 
     def __repr__(self):