Skip to content

Commit 6094508

Browse files
authored
Merge pull request numpy#17399 from leakec/argoutviewm_array-fixes
BLD: Fixed ARGOUTVIEWM memory deallocation. Closes numpy#17398.
2 parents 058af75 + 4c74f37 commit 6094508

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

tools/swig/numpy.i

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2492,9 +2492,9 @@
24922492
if (!array) SWIG_fail;
24932493

24942494
%#ifdef SWIGPY_USE_CAPSULE
2495-
PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
2495+
PyObject* cap = PyCapsule_New((void*)(*$2), SWIGPY_CAPSULE_NAME, free_cap);
24962496
%#else
2497-
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
2497+
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$2), free);
24982498
%#endif
24992499

25002500
%#if NPY_API_VERSION < 0x00000007
@@ -2562,9 +2562,9 @@
25622562
if (!array) SWIG_fail;
25632563

25642564
%#ifdef SWIGPY_USE_CAPSULE
2565-
PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
2565+
PyObject* cap = PyCapsule_New((void*)(*$3), SWIGPY_CAPSULE_NAME, free_cap);
25662566
%#else
2567-
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
2567+
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$3), free);
25682568
%#endif
25692569

25702570
%#if NPY_API_VERSION < 0x00000007
@@ -2632,9 +2632,9 @@
26322632
if (!array || !require_fortran(array)) SWIG_fail;
26332633

26342634
%#ifdef SWIGPY_USE_CAPSULE
2635-
PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
2635+
PyObject* cap = PyCapsule_New((void*)(*$3), SWIGPY_CAPSULE_NAME, free_cap);
26362636
%#else
2637-
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
2637+
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$3), free);
26382638
%#endif
26392639

26402640
%#if NPY_API_VERSION < 0x00000007
@@ -2706,9 +2706,9 @@
27062706
if (!array) SWIG_fail;
27072707

27082708
%#ifdef SWIGPY_USE_CAPSULE
2709-
PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
2709+
PyObject* cap = PyCapsule_New((void*)(*$4), SWIGPY_CAPSULE_NAME, free_cap);
27102710
%#else
2711-
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
2711+
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$4), free);
27122712
%#endif
27132713

27142714
%#if NPY_API_VERSION < 0x00000007
@@ -2780,9 +2780,9 @@
27802780
if (!array || !require_fortran(array)) SWIG_fail;
27812781

27822782
%#ifdef SWIGPY_USE_CAPSULE
2783-
PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
2783+
PyObject* cap = PyCapsule_New((void*)(*$4), SWIGPY_CAPSULE_NAME, free_cap);
27842784
%#else
2785-
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
2785+
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$4), free);
27862786
%#endif
27872787

27882788
%#if NPY_API_VERSION < 0x00000007
@@ -2856,9 +2856,9 @@
28562856
if (!array) SWIG_fail;
28572857

28582858
%#ifdef SWIGPY_USE_CAPSULE
2859-
PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
2859+
PyObject* cap = PyCapsule_New((void*)(*$5), SWIGPY_CAPSULE_NAME, free_cap);
28602860
%#else
2861-
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
2861+
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$5), free);
28622862
%#endif
28632863

28642864
%#if NPY_API_VERSION < 0x00000007
@@ -2932,9 +2932,9 @@
29322932
if (!array || !require_fortran(array)) SWIG_fail;
29332933

29342934
%#ifdef SWIGPY_USE_CAPSULE
2935-
PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
2935+
PyObject* cap = PyCapsule_New((void*)(*$5), SWIGPY_CAPSULE_NAME, free_cap);
29362936
%#else
2937-
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
2937+
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$5), free);
29382938
%#endif
29392939

29402940
%#if NPY_API_VERSION < 0x00000007
@@ -3008,9 +3008,9 @@
30083008
if (!array) SWIG_fail;
30093009

30103010
%#ifdef SWIGPY_USE_CAPSULE
3011-
PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
3011+
PyObject* cap = PyCapsule_New((void*)(*$5), SWIGPY_CAPSULE_NAME, free_cap);
30123012
%#else
3013-
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
3013+
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$5), free);
30143014
%#endif
30153015

30163016
%#if NPY_API_VERSION < 0x00000007
@@ -3084,9 +3084,9 @@
30843084
if (!array || !require_fortran(array)) SWIG_fail;
30853085

30863086
%#ifdef SWIGPY_USE_CAPSULE
3087-
PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
3087+
PyObject* cap = PyCapsule_New((void*)(*$5), SWIGPY_CAPSULE_NAME, free_cap);
30883088
%#else
3089-
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
3089+
PyObject* cap = PyCObject_FromVoidPtr((void*)(*$5), free);
30903090
%#endif
30913091

30923092
%#if NPY_API_VERSION < 0x00000007

0 commit comments

Comments
 (0)