[Scipy-svn] r2495 - trunk/Lib/interpolate

scipy-svn at scipy.org scipy-svn at scipy.org
Sat Jan 6 00:01:24 CST 2007


Author: timl
Date: 2007-01-06 00:01:15 -0600 (Sat, 06 Jan 2007)
New Revision: 2495

Modified:
   trunk/Lib/interpolate/__fitpack.h
Log:
revert patch from [2477] in response to #339. This reopens #248

Modified: trunk/Lib/interpolate/__fitpack.h
===================================================================
--- trunk/Lib/interpolate/__fitpack.h	2007-01-06 05:59:18 UTC (rev 2494)
+++ trunk/Lib/interpolate/__fitpack.h	2007-01-06 06:01:15 UTC (rev 2495)
@@ -140,7 +140,6 @@
   PyObject *x_py = NULL,*y_py = NULL,*z_py = NULL,*w_py = NULL,\
     *tx_py = NULL,*ty_py = NULL;
   PyObject *wrk_py=NULL;
-  PyObject *ret=NULL;
   nx=ny=ier=nxo=nyo=0;
   if (!PyArg_ParseTuple(args, "OOOOddddiiiddOOiiOii",\
 			&x_py,&y_py,&z_py,&w_py,&xb,&xe,\
@@ -225,17 +224,10 @@
   Py_DECREF(ap_y);
   Py_DECREF(ap_z);
   Py_DECREF(ap_w);
-  ret = Py_BuildValue("NNN{s:N,s:i,s:d}",PyArray_Return(ap_tx),\
-	              PyArray_Return(ap_ty),PyArray_Return(ap_c),\
-                      "wrk",PyArray_Return(ap_wrk),\
-		      "ier",ier,"fp",fp);
-  Py_DECREF(ap_tx);
-  Py_DECREF(ap_ty);
-  Py_DECREF(ap_c);
-  Py_DECREF(ap_wrk);
-
-  return ret;
-
+  return Py_BuildValue("NNN{s:N,s:i,s:d}",PyArray_Return(ap_tx),\
+		       PyArray_Return(ap_ty),PyArray_Return(ap_c),\
+		       "wrk",PyArray_Return(ap_wrk),\
+		       "ier",ier,"fp",fp);
   fail:
   if (wa) free(wa);
   Py_XDECREF(ap_x);



More information about the Scipy-svn mailing list