From efa20eba4c84c282c1932cbd3a0f4154a3e7a026 Mon Sep 17 00:00:00 2001
From: Travis Oliphant <oliphant@enthought.com>
Date: Wed, 11 Jan 2006 07:27:46 +0000
Subject: Don't wrap ndarray's in object array wrappers.

---
 numpy/core/src/arrayobject.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'numpy/core/src/arrayobject.c')

diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index 599d9060e..b7b375b66 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -809,6 +809,11 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
 	int swap;
 
 	type_num = descr->type_num;
+	if ((type_num == PyArray_OBJECT) &&		\
+	    (PyArray_Check((*((PyObject **)data))))) {
+		Py_INCREF(*((PyObject **)data));
+		return *((PyObject **)data);
+	}
 	itemsize = descr->elsize;
         type = descr->typeobj;
         copyswap = descr->f->copyswap;
-- 
cgit v1.2.1