summaryrefslogtreecommitdiff
path: root/numpy/f2py/src
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-01-24 19:33:44 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-01-24 19:33:44 +0000
commit4b644a764e0f4d2d6efff0aa73cf51b53d36f808 (patch)
tree0fefa3f7578b51927873af1eeacc4a8f1c59c2db /numpy/f2py/src
parentd1fd99dc4b15fa6d1f943aec4f4fdc7c03537559 (diff)
downloadnumpy-4b644a764e0f4d2d6efff0aa73cf51b53d36f808.tar.gz
Remove bad 'fix' for f2py
Diffstat (limited to 'numpy/f2py/src')
-rw-r--r--numpy/f2py/src/fortranobject.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c
index 3c88b7d8b..eec887f21 100644
--- a/numpy/f2py/src/fortranobject.c
+++ b/numpy/f2py/src/fortranobject.c
@@ -707,7 +707,7 @@ int check_and_fix_dimensions(const PyArrayObject* arr,const int rank,intp *dims)
reversed dimensions from arr->dimensions -- don't do that
anymore...
*/
- /*
+
for (i=0,j=0;i<rank;++i) {
while (j<arr->nd && arr->dimensions[j]<2) ++j;
if (j>=arr->nd) d = 1;
@@ -723,7 +723,8 @@ int check_and_fix_dimensions(const PyArrayObject* arr,const int rank,intp *dims)
} else
dims[i] = d;
}
- */
+
+ /*
for (i=0; i<rank; ++i) {
d = arr->dimensions[i];
if (dims[i]>=0) {
@@ -736,6 +737,7 @@ int check_and_fix_dimensions(const PyArrayObject* arr,const int rank,intp *dims)
if (!dims[i]) dims[i] = 1;
} else dims[i] = d;
}
+ */
for (i=rank;i<arr->nd;++i) { /* [[1,2],[3,4]] -> [1,2,3,4] */
while (j<arr->nd && arr->dimensions[j]<2) ++j;
if (j>=arr->nd) d = 1;