summaryrefslogtreecommitdiff
path: root/numpy/core/src/arrayobject.c
diff options
context:
space:
mode:
authorcookedm <cookedm@localhost>2006-02-21 23:09:12 +0000
committercookedm <cookedm@localhost>2006-02-21 23:09:12 +0000
commitede85cec1879d0d18a797749ccf7fc1853a2146e (patch)
tree450ae37baa762c4357125e428d185aedb8105ac9 /numpy/core/src/arrayobject.c
parentbb23ed753f0548e79bf3371cc7c6a3ec81187bb4 (diff)
parent0aa85cabe66a188a409e51e04186a050ba6d2d79 (diff)
downloadnumpy-ede85cec1879d0d18a797749ccf7fc1853a2146e.tar.gz
Merge trunk (r2124:2142) to power optimization branch
Diffstat (limited to 'numpy/core/src/arrayobject.c')
-rw-r--r--numpy/core/src/arrayobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index ef9fdd6e9..ba47ffd19 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -5771,7 +5771,7 @@ PyArray_CastTo(PyArrayObject *out, PyArrayObject *mp)
if (simple) {
char *inptr;
char *optr = out->data;
- intp obytes = out->descr->elsize * outsize;
+ intp obytes = out->descr->elsize * mpsize;
intp ncopies = outsize / mpsize;
while(ncopies--) {