diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2005-12-05 21:56:27 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2005-12-05 21:56:27 +0000 |
| commit | 73eff17e359d08053183fc0aa4280261ca580dbd (patch) | |
| tree | 71406dab94d9edd803cef57eaad8c805d4818db1 /scipy/base/src/arrayobject.c | |
| parent | 9db8e4f9cb95484af086951c0e22d7d6947b744b (diff) | |
| download | numpy-73eff17e359d08053183fc0aa4280261ca580dbd.tar.gz | |
Fixed up tuple as data descriptor and added datadescr for descriptor constructor
Diffstat (limited to 'scipy/base/src/arrayobject.c')
| -rw-r--r-- | scipy/base/src/arrayobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scipy/base/src/arrayobject.c b/scipy/base/src/arrayobject.c index 1628c7da0..b9a5bbc08 100644 --- a/scipy/base/src/arrayobject.c +++ b/scipy/base/src/arrayobject.c @@ -3290,10 +3290,10 @@ PyArray_NewFromDescr(PyTypeObject *subtype, PyArray_Descr *descr, int nd, PyObject *ret; intp newdims[2*MAX_DIMS]; intp *newstrides=NULL; - memcpy(newdims, dims, nd); + memcpy(newdims, dims, nd*sizeof(intp)); if (strides) { newstrides = newdims + MAX_DIMS; - memcpy(newstrides, strides, nd); + memcpy(newstrides, strides, nd*sizeof(intp)); } nd =_update_descr_and_dimensions(&descr, newdims, newstrides, nd); @@ -7818,7 +7818,7 @@ arraydescr_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds) static PyTypeObject PyArrayDescr_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ - "scipy.descr", /* tp_name */ + "scipy.datadescr", /* tp_name */ sizeof(PyArray_Descr), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ |