From 4b988cf5524d3876c4e5d8b593013254137cbe31 Mon Sep 17 00:00:00 2001 From: Simon Marchetto Date: Fri, 14 Mar 2014 11:44:10 +0100 Subject: [PATCH] scilab: no block in matrix typemaps --- Lib/scilab/scimatrixbool.swg | 40 +++++++++++++++++----------------- Lib/scilab/scimatrixchar.swg | 40 +++++++++++++++++----------------- Lib/scilab/scimatrixdouble.swg | 40 +++++++++++++++++----------------- Lib/scilab/scimatrixint.swg | 38 ++++++++++++++++---------------- 4 files changed, 79 insertions(+), 79 deletions(-) diff --git a/Lib/scilab/scimatrixbool.swg b/Lib/scilab/scimatrixbool.swg index 749a97424..ea2df5ee9 100644 --- a/Lib/scilab/scimatrixbool.swg +++ b/Lib/scilab/scimatrixbool.swg @@ -7,7 +7,7 @@ // in (bool *matrixIn, int matrixInRowCount, int matrixInColCount) -%typemap(in, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *matrixIn, int matrixInRowCount, int matrixInColCount) +%typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *matrixIn, int matrixInRowCount, int matrixInColCount) { if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) { @@ -17,7 +17,7 @@ // in (int matrixInRowCount, int matrixInColCount, bool *matrixIn) -%typemap(in, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (int matrixInRowCount, int matrixInColCount, bool *matrixIn) +%typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (int matrixInRowCount, int matrixInColCount, bool *matrixIn) { if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) { @@ -27,7 +27,7 @@ // in (bool *vectorIn, int vectorInSize) -%typemap(in, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *vectorIn, int vectorInSize) +%typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *vectorIn, int vectorInSize) { int rowCount; int colCount; @@ -43,7 +43,7 @@ // in (int vectorInSize, bool *vectorIn) -%typemap(in) (int vectorInSize, bool *vectorIn) +%typemap(in, noblock=1) (int vectorInSize, bool *vectorIn) { int rowCount; int colCount; @@ -59,18 +59,18 @@ // out (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) -%typemap(in, numinputs=0) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(in, noblock=1, numinputs=0) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { } -%typemap(arginit) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(arginit, noblock=1) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { $1 = (bool**) malloc(sizeof(bool*)); $2 = (int*) malloc(sizeof(int)); $3 = (int*) malloc(sizeof(int)); } -%typemap(freearg) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(freearg, noblock=1) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { free(*$1); free($1); @@ -78,7 +78,7 @@ free($3); } -%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) { @@ -92,18 +92,18 @@ // out (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) -%typemap(in, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) +%typemap(in, noblock=1, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) { } -%typemap(arginit) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) +%typemap(arginit, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) { $1 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int)); $3 = (bool**) malloc(sizeof(bool*)); } -%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *matrixInRowCount, int *matrixInColCount, bool **matrixOut) +%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *matrixInRowCount, int *matrixInColCount, bool **matrixOut) { if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) { @@ -115,7 +115,7 @@ } } -%typemap(freearg) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) +%typemap(freearg, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) { free($1); free($2); @@ -126,17 +126,17 @@ // out (bool **vectorOut, int *vectorOutSize) -%typemap(in, numinputs=0) (bool **vectorOut, int *vectorOutSize) +%typemap(in, noblock=1, numinputs=0) (bool **vectorOut, int *vectorOutSize) { } -%typemap(arginit) (bool **vectorOut, int *vectorOutSize) +%typemap(arginit, noblock=1) (bool **vectorOut, int *vectorOutSize) { $1 = (bool**) malloc(sizeof(bool*)); $2 = (int*) malloc(sizeof(int)); } -%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **vectorOut, int *vectorOutSize) +%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **vectorOut, int *vectorOutSize) { if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) { @@ -148,7 +148,7 @@ } } -%typemap(freearg) (bool **vectorOut, int *vectorOutSize) +%typemap(freearg, noblock=1) (bool **vectorOut, int *vectorOutSize) { free(*$1); free($1); @@ -158,17 +158,17 @@ // out (int *vectorOutSize, bool **vectorOut) -%typemap(in, numinputs=0) (int *vectorOutSize, bool **vectorOut) +%typemap(in, noblock=1, numinputs=0) (int *vectorOutSize, bool **vectorOut) { } -%typemap(arginit) (int *vectorOutSize, bool **vectorOut) +%typemap(arginit, noblock=1) (int *vectorOutSize, bool **vectorOut) { $1 = (int*) malloc(sizeof(int)); $2 = (bool**) malloc(sizeof(bool*)); } -%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *vectorOutSize, bool **vectorOut) +%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *vectorOutSize, bool **vectorOut) { if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) { @@ -180,7 +180,7 @@ } } -%typemap(freearg) (int *vectorOutSize, bool **vectorOut) +%typemap(freearg, noblock=1) (int *vectorOutSize, bool **vectorOut) { free($1); free(*$2); diff --git a/Lib/scilab/scimatrixchar.swg b/Lib/scilab/scimatrixchar.swg index 029da1590..6ee44a08f 100644 --- a/Lib/scilab/scimatrixchar.swg +++ b/Lib/scilab/scimatrixchar.swg @@ -7,7 +7,7 @@ // in (char **matrixIn, int matrixInRowCount, int matrixInColCount) -%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **matrixIn, int matrixInRowCount, int matrixInColCount) +%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **matrixIn, int matrixInRowCount, int matrixInColCount) { if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) { @@ -17,7 +17,7 @@ // in (int matrixInRowCount, int matrixInColCount, char **matrixIn) -%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int matrixInRowCount, int matrixInColCount, char **matrixIn) +%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int matrixInRowCount, int matrixInColCount, char **matrixIn) { if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) { @@ -27,7 +27,7 @@ // in (char **vectorIn, int vectorInSize) -%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **vectorIn, int vectorInSize) +%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **vectorIn, int vectorInSize) { if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, 1, &$2, &$1, fname) != SWIG_OK) { @@ -37,18 +37,18 @@ // out (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) -%typemap(in, numinputs=0) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(in, noblock=1, numinputs=0) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { } -%typemap(arginit) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(arginit, noblock=1) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { $1 = (char***) malloc(sizeof(char**)); $2 = (int*) malloc(sizeof(int)); $3 = (int*) malloc(sizeof(int)); } -%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) { @@ -60,7 +60,7 @@ } } -%typemap(freearg) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(freearg, noblock=1) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { free(*$1); free($1); @@ -70,18 +70,18 @@ // out (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) -%typemap(in, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) +%typemap(in, noblock=1, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) { } -%typemap(arginit) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) +%typemap(arginit, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) { $1 = (char***) malloc(sizeof(char**)); $2 = (int*) malloc(sizeof(int)); $3 = (int**) malloc(sizeof(int*)); } -%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) +%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) { if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) { @@ -93,7 +93,7 @@ } } -%typemap(freearg) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) +%typemap(freearg, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) { free($1); free($2); @@ -104,17 +104,17 @@ // out (char ***vectorOut, int *vectorOutSize) -%typemap(in, numinputs=0) (char ***vectorOut, int *vectorOutSize) +%typemap(in, noblock=1, numinputs=0) (char ***vectorOut, int *vectorOutSize) { } -%typemap(arginit) (char ***vectorOut, int *vectorOutSize) +%typemap(arginit, noblock=1) (char ***vectorOut, int *vectorOutSize) { $1 = (char***) malloc(sizeof(char**)); $2 = (int*) malloc(sizeof(int)); } -%typemap(freearg) (char ***vectorOut, int *vectorOutSize) +%typemap(freearg, noblock=1) (char ***vectorOut, int *vectorOutSize) { free(*(*$1)); free(*$1); @@ -122,7 +122,7 @@ free($2); } -%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***vectorOut, int *vectorOutSize) +%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***vectorOut, int *vectorOutSize) { if (SWIG_SciString_FromCharPtrArray(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) { @@ -136,7 +136,7 @@ // in (int vectorInSize, char **vectorIn) -%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int vectorInSize, char **vectorIn) +%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int vectorInSize, char **vectorIn) { if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, 1, &$1, &$2, fname) != SWIG_OK) { @@ -146,17 +146,17 @@ // out (int *vectorOutSize, char ***vectorOut) -%typemap(in, numinputs=0) (int *vectorOutSize, char ***vectorOut) +%typemap(in, noblock=1, numinputs=0) (int *vectorOutSize, char ***vectorOut) { } -%typemap(arginit) (int *vectorOutSize, char ***vectorOut) +%typemap(arginit, noblock=1) (int *vectorOutSize, char ***vectorOut) { $1 = (int*) malloc(sizeof(int)); $2 = (char***) malloc(sizeof(char**)); } -%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *vectorOutSize, char ***vectorOut) +%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *vectorOutSize, char ***vectorOut) { if (SWIG_SciString_FromCharPtrArray(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) { @@ -168,7 +168,7 @@ } } -%typemap(freearg) (int *vectorOutSize, char ***vectorOut) +%typemap(freearg, noblock=1) (int *vectorOutSize, char ***vectorOut) { free($1); free(*(*$2)); diff --git a/Lib/scilab/scimatrixdouble.swg b/Lib/scilab/scimatrixdouble.swg index 9a6d369a5..0d33c0563 100644 --- a/Lib/scilab/scimatrixdouble.swg +++ b/Lib/scilab/scimatrixdouble.swg @@ -7,7 +7,7 @@ // in (double *matrixIn, int matrixInRowCount, int matrixInColCount) -%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *matrixIn, int matrixInRowCount, int matrixInColCount) +%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *matrixIn, int matrixInRowCount, int matrixInColCount) { if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) { @@ -17,7 +17,7 @@ // in (int matrixInRowCount, int matrixInColCount, double *matrixIn) -%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int matrixInRowCount, int matrixInColCount, double *matrixIn) +%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int matrixInRowCount, int matrixInColCount, double *matrixIn) { if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) { @@ -27,7 +27,7 @@ // in (double *vectorIn, int vectorInSize) -%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *vectorIn, int vectorInSize) +%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *vectorIn, int vectorInSize) { int rowCount; int colCount; @@ -43,7 +43,7 @@ // in (int vectorInSize, double *vectorIn) -%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int vectorInSize, double *vectorIn) +%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int vectorInSize, double *vectorIn) { int rowCount; int colCount; @@ -59,18 +59,18 @@ // out (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) -%typemap(in, numinputs=0) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(in, noblock=1, numinputs=0) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { } -%typemap(arginit) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(arginit, noblock=1) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { $1 = (double**) malloc(sizeof(double*)); $2 = (int*) malloc(sizeof(int)); $3 = (int*) malloc(sizeof(int)); } -%typemap(freearg) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(freearg, noblock=1) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { free(*$1); free($1); @@ -78,7 +78,7 @@ free($3); } -%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) { @@ -92,18 +92,18 @@ // out (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) -%typemap(in, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) +%typemap(in, noblock=1, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) { } -%typemap(arginit) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) +%typemap(arginit, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) { $1 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int)); $3 = (double**) malloc(sizeof(double*)); } -%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *matrixInRowCount, int *matrixInColCount, double **matrixOut) +%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *matrixInRowCount, int *matrixInColCount, double **matrixOut) { if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) { @@ -115,7 +115,7 @@ } } -%typemap(freearg) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) +%typemap(freearg, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) { free($1); free($2); @@ -126,17 +126,17 @@ // out (double **vectorOut, int *vectorOutSize) -%typemap(in, numinputs=0) (double **vectorOut, int *vectorOutSize) +%typemap(in, noblock=1, numinputs=0) (double **vectorOut, int *vectorOutSize) { } -%typemap(arginit) (double **vectorOut, int *vectorOutSize) +%typemap(arginit, noblock=1) (double **vectorOut, int *vectorOutSize) { $1 = (double**) malloc(sizeof(double*)); $2 = (int*) malloc(sizeof(int)); } -%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **vectorOut, int *vectorOutSize) +%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **vectorOut, int *vectorOutSize) { if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) { @@ -148,7 +148,7 @@ } } -%typemap(freearg) (double **vectorOut, int *vectorOutSize) +%typemap(freearg, noblock=1) (double **vectorOut, int *vectorOutSize) { free(*$1); free($1); @@ -158,17 +158,17 @@ // out (int *vectorOutSize, double **vectorOut) -%typemap(in, numinputs=0) (int *vectorOutSize, double **vectorOut) +%typemap(in, noblock=1, numinputs=0) (int *vectorOutSize, double **vectorOut) { } -%typemap(arginit) (int *vectorOutSize, double **vectorOut) +%typemap(arginit, noblock=1) (int *vectorOutSize, double **vectorOut) { $1 = (int*) malloc(sizeof(int)); $2 = (double**) malloc(sizeof(double*)); } -%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *vectorOutSize, double **vectorOut) +%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *vectorOutSize, double **vectorOut) { if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) { @@ -180,7 +180,7 @@ } } -%typemap(freearg) (int *vectorOutSize, double **vectorOut) +%typemap(freearg, noblock=1) (int *vectorOutSize, double **vectorOut) { free($1); free(*$2); diff --git a/Lib/scilab/scimatrixint.swg b/Lib/scilab/scimatrixint.swg index 70b2c9187..971abe06a 100644 --- a/Lib/scilab/scimatrixint.swg +++ b/Lib/scilab/scimatrixint.swg @@ -7,7 +7,7 @@ // in (int *matrixIn, int matrixInRowCount, int matrixInColCount) -%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *matrixIn, int matrixInRowCount, int matrixInColCount) +%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *matrixIn, int matrixInRowCount, int matrixInColCount) { if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) { @@ -18,7 +18,7 @@ // in (int matrixInRowCount, int matrixInColCount, int *matrixIn) -%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int matrixInRowCount, int matrixInColCount, int *matrixIn) +%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int matrixInRowCount, int matrixInColCount, int *matrixIn) { if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) { @@ -29,7 +29,7 @@ // in (int *vectorIn, int vectorInSize) -%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *vectorIn, int vectorInSize) +%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *vectorIn, int vectorInSize) { int rowCount; int colCount; @@ -46,7 +46,7 @@ // in (int vectorInSize, int *vectorIn) -%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int vectorInSize, int *vectorIn) +%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int vectorInSize, int *vectorIn) { int rowCount; int colCount; @@ -62,18 +62,18 @@ // out (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) -%typemap(in, numinputs=0) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(in, noblock=1, numinputs=0) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { } -%typemap(arginit) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(arginit, noblock=1) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { $1 = (int**) malloc(sizeof(int*)); $2 = (int*) malloc(sizeof(int)); $3 = (int*) malloc(sizeof(int)); } -%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) { @@ -85,7 +85,7 @@ } } -%typemap(freearg) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) +%typemap(freearg, noblock=1) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { free(*$1); free($1); @@ -96,18 +96,18 @@ // out (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) -%typemap(in, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) +%typemap(in, noblock=1, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) { } -%typemap(arginit) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) +%typemap(arginit, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) { $1 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int)); $3 = (int**) malloc(sizeof(int*)); } -%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) +%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) { if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) { @@ -119,7 +119,7 @@ } } -%typemap(freearg) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) +%typemap(freearg, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) { free($1); free($2); @@ -130,7 +130,7 @@ // out (int **vectorOut, int *vectorOutSize) -%typemap(in, numinputs=0) (int **vectorOut, int *vectorOutSize) +%typemap(in, noblock=1, numinputs=0) (int **vectorOut, int *vectorOutSize) { } @@ -140,7 +140,7 @@ $2 = (int*) malloc(sizeof(int)); } -%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **vectorOut, int *vectorOutSize) +%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **vectorOut, int *vectorOutSize) { if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) { @@ -152,7 +152,7 @@ } } -%typemap(freearg) (int **vectorOut, int *vectorOutSize) +%typemap(freearg, noblock=1) (int **vectorOut, int *vectorOutSize) { free(*$1); free($1); @@ -162,17 +162,17 @@ // out (int *vectorOutSize, int **vectorOut) -%typemap(in, numinputs=0) (int *vectorOutSize, int **vectorOut) +%typemap(in, noblock=1, numinputs=0) (int *vectorOutSize, int **vectorOut) { } -%typemap(arginit) (int *vectorOutSize, int **vectorOut) +%typemap(arginit, noblock=1) (int *vectorOutSize, int **vectorOut) { $1 = (int*) malloc(sizeof(int)); $2 = (int**) malloc(sizeof(int*)); } -%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *vectorOutSize, int **vectorOut) +%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *vectorOutSize, int **vectorOut) { if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) { @@ -184,7 +184,7 @@ } } -%typemap(freearg) (int *vectorInSize, int **vectorOut) +%typemap(freearg, noblock=1) (int *vectorInSize, int **vectorOut) { free($1); free(*$2);