Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cython
Commits
0ea99df7
Commit
0ea99df7
authored
Feb 01, 2015
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Plain Diff
merge 0.22.x branch into master
parents
8567f2c2
85e1fa0c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
Cython/Utility/MemoryView.pyx
Cython/Utility/MemoryView.pyx
+2
-3
No files found.
Cython/Utility/MemoryView.pyx
View file @
0ea99df7
...
@@ -960,7 +960,6 @@ cdef memoryview_fromslice({{memviewslice_name}} memviewslice,
...
@@ -960,7 +960,6 @@ cdef memoryview_fromslice({{memviewslice_name}} memviewslice,
bint
dtype_is_object
):
bint
dtype_is_object
):
cdef
_memoryviewslice
result
cdef
_memoryviewslice
result
cdef
int
i
if
<
PyObject
*>
memviewslice
.
memview
==
Py_None
:
if
<
PyObject
*>
memviewslice
.
memview
==
Py_None
:
return
None
return
None
...
@@ -995,8 +994,8 @@ cdef memoryview_fromslice({{memviewslice_name}} memviewslice,
...
@@ -995,8 +994,8 @@ cdef memoryview_fromslice({{memviewslice_name}} memviewslice,
break
break
result
.
view
.
len
=
result
.
view
.
itemsize
result
.
view
.
len
=
result
.
view
.
itemsize
for
i
in
range
(
ndim
)
:
for
length
in
result
.
view
.
shape
[:
ndim
]
:
result
.
view
.
len
*=
result
.
view
.
shape
[
i
]
result
.
view
.
len
*=
length
result
.
to_object_func
=
to_object_func
result
.
to_object_func
=
to_object_func
result
.
to_dtype_func
=
to_dtype_func
result
.
to_dtype_func
=
to_dtype_func
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment