Permalink
Browse files

Merge branch 'pull-341' into master.

See #341
  • Loading branch information...
2 parents c4dcc00 + d8d18fc commit 7fade91d63294a304eade0f5652e03e41d4c361b @rgommers rgommers committed Oct 29, 2012
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -408,14 +408,14 @@ cdef class VarReader5:
if mod8:
self.cstream.seek(8 - mod8, 1)
return 0
-
- cpdef inline cnp.ndarray read_numeric(self, int copy=True):
+
+ cpdef cnp.ndarray read_numeric(self, int copy=True):
''' Read numeric data element into ndarray
- Reads element, then casts to ndarray.
+ Reads element, then casts to ndarray.
The type of the array is given by the ``mdtype`` returned via
- ``read_element``.
+ ``read_element``.
'''
cdef cnp.uint32_t mdtype, byte_count
cdef void *data_ptr
@@ -440,7 +440,7 @@ cdef class VarReader5:
Py_INCREF(<object> data)
PyArray_Set_BASE(el, data)
return el
-
+
cdef inline object read_int8_string(self):
''' Read, return int8 type string
Oops, something went wrong.

0 comments on commit 7fade91

Please sign in to comment.