Commit aa012cc8 authored by Stefan Behnel's avatar Stefan Behnel

clean up dependencies of memoryview utility code snippets a bit to get rid of...

clean up dependencies of memoryview utility code snippets a bit to get rid of some 'unused function' C compiler warnings
parent e3974396
...@@ -916,8 +916,7 @@ memviewslice_init_code = load_memview_c_utility( ...@@ -916,8 +916,7 @@ memviewslice_init_code = load_memview_c_utility(
context=dict(context, BUF_MAX_NDIMS=Options.buffer_max_dims), context=dict(context, BUF_MAX_NDIMS=Options.buffer_max_dims),
requires=[memviewslice_declare_code, requires=[memviewslice_declare_code,
Buffer.acquire_utility_code, Buffer.acquire_utility_code,
atomic_utility, atomic_utility],
Buffer.typeinfo_compare_code],
) )
memviewslice_index_helpers = load_memview_c_utility("MemviewSliceIndex") memviewslice_index_helpers = load_memview_c_utility("MemviewSliceIndex")
......
...@@ -621,7 +621,7 @@ cdef memoryview_cwrapper(object o, int flags, bint dtype_is_object, __Pyx_TypeIn ...@@ -621,7 +621,7 @@ cdef memoryview_cwrapper(object o, int flags, bint dtype_is_object, __Pyx_TypeIn
return result return result
@cname('__pyx_memoryview_check') @cname('__pyx_memoryview_check')
cdef bint memoryview_check(object o): cdef inline bint memoryview_check(object o):
return isinstance(o, memoryview) return isinstance(o, memoryview)
cdef tuple _unellipsify(object index, int ndim): cdef tuple _unellipsify(object index, int ndim):
......
...@@ -93,16 +93,6 @@ static CYTHON_INLINE {{memviewslice_name}} {{funcname}}(PyObject *); ...@@ -93,16 +93,6 @@ static CYTHON_INLINE {{memviewslice_name}} {{funcname}}(PyObject *);
#define __Pyx_IS_C_CONTIG 1 #define __Pyx_IS_C_CONTIG 1
#define __Pyx_IS_F_CONTIG 2 #define __Pyx_IS_F_CONTIG 2
static int __Pyx_ValidateAndInit_memviewslice(
int *axes_specs,
int c_or_f_flag,
int buf_flags,
int ndim,
__Pyx_TypeInfo *dtype,
__Pyx_BufFmt_StackElem stack[],
__Pyx_memviewslice *memviewslice,
PyObject *original_obj);
static int __Pyx_init_memviewslice( static int __Pyx_init_memviewslice(
struct __pyx_memoryview_obj *memview, struct __pyx_memoryview_obj *memview,
int ndim, int ndim,
...@@ -129,6 +119,7 @@ static CYTHON_INLINE char *__pyx_memviewslice_index_full( ...@@ -129,6 +119,7 @@ static CYTHON_INLINE char *__pyx_memviewslice_index_full(
/////////////// ObjectToMemviewSlice /////////////// /////////////// ObjectToMemviewSlice ///////////////
//@requires: MemviewSliceValidateAndInit
static CYTHON_INLINE {{memviewslice_name}} {{funcname}}(PyObject *obj) { static CYTHON_INLINE {{memviewslice_name}} {{funcname}}(PyObject *obj) {
{{memviewslice_name}} result = {{memslice_init}}; {{memviewslice_name}} result = {{memslice_init}};
...@@ -158,7 +149,20 @@ __pyx_fail: ...@@ -158,7 +149,20 @@ __pyx_fail:
} }
////////// MemviewSliceInit ////////// /////////////// MemviewSliceValidateAndInit.proto ///////////////
static int __Pyx_ValidateAndInit_memviewslice(
int *axes_specs,
int c_or_f_flag,
int buf_flags,
int ndim,
__Pyx_TypeInfo *dtype,
__Pyx_BufFmt_StackElem stack[],
__Pyx_memviewslice *memviewslice,
PyObject *original_obj);
/////////////// MemviewSliceValidateAndInit ///////////////
//@requires: Buffer.c::TypeInfoCompare
static int static int
__pyx_check_strides(Py_buffer *buf, int dim, int ndim, int spec) __pyx_check_strides(Py_buffer *buf, int dim, int ndim, int spec)
...@@ -368,6 +372,9 @@ no_fail: ...@@ -368,6 +372,9 @@ no_fail:
return retval; return retval;
} }
////////// MemviewSliceInit //////////
static int static int
__Pyx_init_memviewslice(struct __pyx_memoryview_obj *memview, __Pyx_init_memviewslice(struct __pyx_memoryview_obj *memview,
int ndim, int ndim,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment