Fixed reshape handling of shape argument when it's an ndarray.

RobAmos · Apr 22, 2011 · b1f7d19 · b1f7d19
1 parent b42256f
commit b1f7d19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/numpy/NumpyDotNet/NpyUtils.cs b/numpy/NumpyDotNet/NpyUtils.cs
@@ -553,8 +553,8 @@ internal static IntPtr IntpConverter(object arg) {
             }
         }
 
-        internal static IntPtr[] IntpListConverter(IList<object> args) {
-            IntPtr[] result = new IntPtr[args.Count];
+        internal static IntPtr[] IntpListConverter(IEnumerable<object> args) {
+            IntPtr[] result = new IntPtr[args.Count()];
             int i=0;
             foreach (object arg in args) {
                 result[i++] = IntpConverter(arg);

diff --git a/numpy/NumpyDotNet/ndarray.cs b/numpy/NumpyDotNet/ndarray.cs
@@ -1649,11 +1649,12 @@ public ndarray reshape([ParamDictionary] IDictionary<object,object> kwds, params
             // TODO: Add NpyArray_View call for (None) case. (Why?)
             if (args == null) {
                 newshape = new IntPtr[0];
-            } else if (args.Length == 1 && args[0] is IList<object>) {
-                newshape = NpyUtil_ArgProcessing.IntpListConverter((IList<object>)args[0]);
+            } else if (args.Length == 1 && (args[0] is IList<object> || args[0] is ndarray)) {
+                newshape = NpyUtil_ArgProcessing.IntpListConverter((IEnumerable<object>)args[0]);
             } else {
                 newshape = NpyUtil_ArgProcessing.IntpListConverter(args);
             }
+            Console.WriteLine("Calling NewShape with {0}, {1}", newshape, order);
             return NpyCoreApi.Newshape(this, newshape, order);
         }