diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2014-05-29 16:18:09 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2014-05-29 16:18:09 -0600 |
commit | 3d88c07caa20699fd60f7f858b8d62345db5714b (patch) | |
tree | 211aa4e846bbac41e50efb08f4cb0b00d0e5d64f | |
parent | 075872dc3d35c0c3c904b046621e7876c37b179a (diff) | |
parent | 39715d58001d8cad0ac44cdbbb4019222635bff9 (diff) | |
download | numpy-3d88c07caa20699fd60f7f858b8d62345db5714b.tar.gz |
Merge pull request #4745 from dfroger/swig_missing_fragment
BUG: Fix missing fragment in ARGOUTVIEWM typemaps.
-rw-r--r-- | tools/swig/numpy.i | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tools/swig/numpy.i b/tools/swig/numpy.i index 49c742616..e250e78bf 100644 --- a/tools/swig/numpy.i +++ b/tools/swig/numpy.i @@ -2388,7 +2388,7 @@ $2 = &dim_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility") + fragment="NumPy_Backward_Compatibility,NumPy_Utilities") (DATA_TYPE** ARGOUTVIEWM_ARRAY1, DIM_TYPE* DIM1) { npy_intp dims[1] = { *$2 }; @@ -2422,7 +2422,7 @@ $2 = &data_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility") + fragment="NumPy_Backward_Compatibility,NumPy_Utilities") (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEWM_ARRAY1) { npy_intp dims[1] = { *$1 }; @@ -2457,7 +2457,7 @@ $3 = &dim2_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility") + fragment="NumPy_Backward_Compatibility,NumPy_Utilities") (DATA_TYPE** ARGOUTVIEWM_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) { npy_intp dims[2] = { *$2, *$3 }; @@ -2492,7 +2492,7 @@ $3 = &data_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility") + fragment="NumPy_Backward_Compatibility,NumPy_Utilities") (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEWM_ARRAY2) { npy_intp dims[2] = { *$1, *$2 }; @@ -2527,7 +2527,7 @@ $3 = &dim2_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") + fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") (DATA_TYPE** ARGOUTVIEWM_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) { npy_intp dims[2] = { *$2, *$3 }; @@ -2562,7 +2562,7 @@ $3 = &data_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") + fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEWM_FARRAY2) { npy_intp dims[2] = { *$1, *$2 }; @@ -2599,7 +2599,7 @@ $4 = &dim3_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility") + fragment="NumPy_Backward_Compatibility,NumPy_Utilities") (DATA_TYPE** ARGOUTVIEWM_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) { npy_intp dims[3] = { *$2, *$3, *$4 }; @@ -2636,7 +2636,7 @@ $4 = &data_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility") + fragment="NumPy_Backward_Compatibility,NumPy_Utilities") (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEWM_ARRAY3) { npy_intp dims[3] = { *$1, *$2, *$3 }; @@ -2673,7 +2673,7 @@ $4 = &dim3_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") + fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") (DATA_TYPE** ARGOUTVIEWM_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) { npy_intp dims[3] = { *$2, *$3, *$4 }; @@ -2710,7 +2710,7 @@ $4 = &data_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") + fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEWM_FARRAY3) { npy_intp dims[3] = { *$1, *$2, *$3 }; @@ -2748,7 +2748,7 @@ $5 = &dim4_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility") + fragment="NumPy_Backward_Compatibility,NumPy_Utilities") (DATA_TYPE** ARGOUTVIEWM_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) { npy_intp dims[4] = { *$2, *$3, *$4 , *$5 }; @@ -2786,7 +2786,7 @@ $5 = &data_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility") + fragment="NumPy_Backward_Compatibility,NumPy_Utilities") (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEWM_ARRAY4) { npy_intp dims[4] = { *$1, *$2, *$3 , *$4 }; @@ -2824,7 +2824,7 @@ $5 = &dim4_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") + fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") (DATA_TYPE** ARGOUTVIEWM_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) { npy_intp dims[4] = { *$2, *$3, *$4 , *$5 }; @@ -2862,7 +2862,7 @@ $5 = &data_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") + fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEWM_FARRAY4) { npy_intp dims[4] = { *$1, *$2, *$3 , *$4 }; @@ -2900,7 +2900,7 @@ $5 = &dim4_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility") + fragment="NumPy_Backward_Compatibility,NumPy_Utilities") (DATA_TYPE** ARGOUTVIEWM_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) { npy_intp dims[4] = { *$2, *$3, *$4 , *$5 }; @@ -2938,7 +2938,7 @@ $5 = &data_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility") + fragment="NumPy_Backward_Compatibility,NumPy_Utilities") (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEWM_ARRAY4) { npy_intp dims[4] = { *$1, *$2, *$3 , *$4 }; @@ -2976,7 +2976,7 @@ $5 = &dim4_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") + fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") (DATA_TYPE** ARGOUTVIEWM_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4) { npy_intp dims[4] = { *$2, *$3, *$4 , *$5 }; @@ -3014,7 +3014,7 @@ $5 = &data_temp; } %typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") + fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements,NumPy_Utilities") (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4, DATA_TYPE** ARGOUTVIEWM_FARRAY4) { npy_intp dims[4] = { *$1, *$2, *$3 , *$4 }; |