octave_fun

@@ -94,11 +94,11 @@

Report an issue

- << scilab_octave + << scilab_octave

- scilab_octave + scilab_octave

diff --git a/help/en_US/scilab_en_US_help/section_5e7519fee5718c0930fe5ef6701da2b8.html b/help/en_US/scilab_en_US_help/section_5e7519fee5718c0930fe5ef6701da2b8.html new file mode 100644 index 0000000..a828712 --- /dev/null +++ b/help/en_US/scilab_en_US_help/section_5e7519fee5718c0930fe5ef6701da2b8.html @@ -0,0 +1,55 @@ + + + + + + +

+ + + + +

+ +

+ scilab_octave + +

+ +

+ + + + scilab_octave >> scilab_octave + +

+

scilab_octave

octave_fun — Calls an octave function with given inputs and returns the expected output

+
+ +

+ + + + + + +

Report an issue
+ +	+ scilab_octave + +	+ +

+ + diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar index 81861cc..973d083 100644 Binary files a/jar/scilab_en_US_help.jar and b/jar/scilab_en_US_help.jar differ diff --git a/sci_gateway/cpp/libscilab_octave.so b/sci_gateway/cpp/libscilab_octave.so index 221c3c8..5069d2b 100755 Binary files a/sci_gateway/cpp/libscilab_octave.so and b/sci_gateway/cpp/libscilab_octave.so differ diff --git a/sci_gateway/cpp/sci_octave.cpp b/sci_gateway/cpp/sci_octave.cpp index 817c184..177a6b9 100644 --- a/sci_gateway/cpp/sci_octave.cpp +++ b/sci_gateway/cpp/sci_octave.cpp @@ -368,6 +368,10 @@ extern "C" else if (outStruct[j].type == TYPE_STRING){ scilab_setStructMatrix2dData(env, out[i], (const wchar_t*) outStruct[j].key, 0, 0, scilab_createString(env, (const wchar_t*) outStruct[j].str)); } + else{ + Scierror(999, _("%s: Unsupported type of output argument in struct %d for key \"%ls\".\n"), fname, i, (const wchar_t*) outStruct[i].key); + return STATUS_ERROR; + } } } else if (ins[i].is_out_string == 1){ diff --git a/src/fun.cpp b/src/fun.cpp index 1362e67..8929d83 100644 --- a/src/fun.cpp +++ b/src/fun.cpp @@ -275,7 +275,7 @@ extern "C" outStruct[j].str = malloc(sizeof(wchar_t) * (currValueStr.length() + 1)); mbstowcs((wchar_t*) outStruct[j].str, currValueStr.c_str(), currValueStr.length() + 1); } - else { + else if (currValue.is_double_type()){ outStruct[j].type = TYPE_DOUBLE; Matrix currValueMatrix(currValue.matrix_value()); diff --git a/src/fun.o b/src/fun.o index ca3d57a..db956ed 100644 Binary files a/src/fun.o and b/src/fun.o differ diff --git a/src/libfun.so b/src/libfun.so index 581c20b..eb0a7e0 100755 Binary files a/src/libfun.so and b/src/libfun.so differ diff --git a/thirdparty/linux/lib/x64/libfun.so b/thirdparty/linux/lib/x64/libfun.so index 581c20b..eb0a7e0 100755 Binary files a/thirdparty/linux/lib/x64/libfun.so and b/thirdparty/linux/lib/x64/libfun.so differ -- cgit