[Numpy-svn] r5245 - trunk/numpy/core/src

numpy-svn at scipy.org numpy-svn at scipy.org
Thu May 29 11:15:54 EDT 2008


Author: oliphant
Date: 2008-05-29 10:15:45 -0500 (Thu, 29 May 2008)
New Revision: 5245

Modified:
   trunk/numpy/core/src/ufuncobject.c
Log:
Use memmove when memory areas can overlap.

Modified: trunk/numpy/core/src/ufuncobject.c
===================================================================
--- trunk/numpy/core/src/ufuncobject.c	2008-05-29 02:31:28 UTC (rev 5244)
+++ trunk/numpy/core/src/ufuncobject.c	2008-05-29 15:15:45 UTC (rev 5245)
@@ -2742,7 +2742,7 @@
         while(loop->index < loop->size) {
             if (loop->obj)
                 Py_INCREF(*((PyObject **)loop->it->dataptr));
-            memcpy(loop->bufptr[0], loop->it->dataptr,
+            memmove(loop->bufptr[0], loop->it->dataptr,
                    loop->outsize);
             PyArray_ITER_NEXT(loop->it);
             loop->bufptr[0] += loop->outsize;
@@ -2755,7 +2755,7 @@
             /* Copy first element to output */
             if (loop->obj)
                 Py_INCREF(*((PyObject **)loop->it->dataptr));
-            memcpy(loop->bufptr[0], loop->it->dataptr,
+            memmove(loop->bufptr[0], loop->it->dataptr,
                    loop->outsize);
             /* Adjust input pointer */
             loop->bufptr[1] = loop->it->dataptr+loop->steps[1];




More information about the Numpy-svn mailing list