← Back to branch summary

~jtaylor/ubuntu/precise/python-numpy/multiarch-fix-818867

« back to all changes in this revision

Viewing changes to numpy/random/mtrand/numpy.pxi

  • Committer: Bazaar Package Importer
  • Author(s): Sandro Tosi
  • Date: 2010-10-07 10:19:13 UTC
  • mfrom: (7.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20101007101913-8b1kmt8ho4upcl9s
Tags: 1:1.4.1-5
http://bugs.debian.org/581058
* debian/patches/10_use_local_python.org_object.inv_sphinx.diff
  - fixed small typo in description
* debian/patches/changeset_r8364.diff
  - fix memory corruption (double free); thanks to Joseph Barillari for the
    report and to Michael Gilbert for pushing resolution; Closes: #581058

Show diffs side-by-side

added added

removed removed

Lines of Context:
numpy/random/mtrand/numpy.pxi
7
7
        NPY_BYTE
8
8
        NPY_UBYTE
9
9
        NPY_SHORT
10
 
        NPY_USHORT 
 
10
        NPY_USHORT
11
11
        NPY_INT
12
 
        NPY_UINT 
 
12
        NPY_UINT
13
13
        NPY_LONG
14
14
        NPY_ULONG
15
15
        NPY_LONGLONG
16
16
        NPY_ULONGLONG
17
17
        NPY_FLOAT
18
 
        NPY_DOUBLE 
 
18
        NPY_DOUBLE
19
19
        NPY_LONGDOUBLE
20
20
        NPY_CFLOAT
21
21
        NPY_CDOUBLE
56
56
        NPY_OUT_FARRAY
57
57
        NPY_INOUT_FARRAY
58
58
 
59
 
        NPY_UPDATE_ALL 
 
59
        NPY_UPDATE_ALL
60
60
 
61
61
    cdef enum defines:
62
62
        NPY_MAXDIMS
69
69
        double real
70
70
        double imag
71
71
 
72
 
    ctypedef int npy_intp 
 
72
    ctypedef int npy_intp
73
73
 
74
74
    ctypedef extern class numpy.dtype [object PyArray_Descr]:
75
75
        cdef int type_num, elsize, alignment
90
90
        cdef npy_intp index, size
91
91
        cdef ndarray ao
92
92
        cdef char *dataptr
93
 
        
 
93
 
94
94
    ctypedef extern class numpy.broadcast [object PyArrayMultiIterObject]:
95
95
        cdef int numiter
96
96
        cdef npy_intp size, index
103
103
    dtype PyArray_DescrFromTypeNum(NPY_TYPES type_num)
104
104
    object PyArray_SimpleNew(int ndims, npy_intp* dims, NPY_TYPES type_num)
105
105
    int PyArray_Check(object obj)
106
 
    object PyArray_ContiguousFromAny(object obj, NPY_TYPES type, 
 
106
    object PyArray_ContiguousFromAny(object obj, NPY_TYPES type,
107
107
        int mindim, int maxdim)
108
 
    object PyArray_ContiguousFromObject(object obj, NPY_TYPES type, 
 
108
    object PyArray_ContiguousFromObject(object obj, NPY_TYPES type,
109
109
        int mindim, int maxdim)
110
110
    npy_intp PyArray_SIZE(ndarray arr)
111
111
    npy_intp PyArray_NBYTES(ndarray arr)
112
112
    void *PyArray_DATA(ndarray arr)
113
113
    object PyArray_FromAny(object obj, dtype newtype, int mindim, int maxdim,
114
 
                    int requirements, object context)
 
114
                            int requirements, object context)
115
115
    object PyArray_FROMANY(object obj, NPY_TYPES type_num, int min,
116
116
                           int max, int requirements)
117
117
    object PyArray_NewFromDescr(object subtype, dtype newtype, int nd,
124
124
    object PyArray_MultiIterNew(int n, ...)
125
125
 
126
126
    char *PyArray_MultiIter_DATA(broadcast multi, int i)
127
 
    void PyArray_MultiIter_NEXTi(broadcast multi, int i) 
 
127
    void PyArray_MultiIter_NEXTi(broadcast multi, int i)
128
128
    void PyArray_MultiIter_NEXT(broadcast multi)
129
129
 
130
130
    object PyArray_IterNew(object arr)