summaryrefslogtreecommitdiffstats
path: root/scilab/modules/javasci
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-10-27 15:09:46 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-10-27 15:09:46 +0100
commit2e7e1f718124361b9f065da930223b5aaaf3fd43 (patch)
treef0a6d99d8a39ef9998e26e1ebadbc2f6791822a7 /scilab/modules/javasci
parent42e6328696ca849f9421144df64dcb1906965563 (diff)
downloadscilab-2e7e1f718124361b9f065da930223b5aaaf3fd43.zip
scilab-2e7e1f718124361b9f065da930223b5aaaf3fd43.tar.gz
Rename of the structure StrErr => SciErr for something more explicit
Diffstat (limited to 'scilab/modules/javasci')
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciAbstractArray.c26
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciBooleanArray.c2
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciComplexArray.c4
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciDoubleArray.c2
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciIntegerArray.c2
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciStringArray.c2
-rw-r--r--scilab/modules/javasci/src/c/javasci_Scilab.c4
-rw-r--r--scilab/modules/javasci/src/c/javasci_Scilab2.c12
8 files changed, 27 insertions, 27 deletions
diff --git a/scilab/modules/javasci/src/c/javasci_SciAbstractArray.c b/scilab/modules/javasci/src/c/javasci_SciAbstractArray.c
index 451b161..ebfaaca 100644
--- a/scilab/modules/javasci/src/c/javasci_SciAbstractArray.c
+++ b/scilab/modules/javasci/src/c/javasci_SciAbstractArray.c
@@ -52,7 +52,7 @@ JNIEXPORT void JNICALL Java_javasci_SciAbstractArray_Initialize (JNIEnv *env, jc
52*/ 52*/
53JNIEXPORT jint JNICALL Java_javasci_SciAbstractArray_getNumberOfRowsFromScilab(JNIEnv *env, jobject obj_this, jstring name) 53JNIEXPORT jint JNICALL Java_javasci_SciAbstractArray_getNumberOfRowsFromScilab(JNIEnv *env, jobject obj_this, jstring name)
54{ 54{
55 StrErr strErr; 55 SciErr strErr;
56 const char *cname = NULL; 56 const char *cname = NULL;
57 jint row = -1; 57 jint row = -1;
58 int dimension[2]; 58 int dimension[2];
@@ -82,7 +82,7 @@ JNIEXPORT jint JNICALL Java_javasci_SciAbstractArray_getNumberOfRowsFromScilab(J
82*/ 82*/
83JNIEXPORT jint JNICALL Java_javasci_SciAbstractArray_getNumberOfColsFromScilab(JNIEnv *env, jobject obj_this, jstring name) 83JNIEXPORT jint JNICALL Java_javasci_SciAbstractArray_getNumberOfColsFromScilab(JNIEnv *env, jobject obj_this, jstring name)
84{ 84{
85 StrErr strErr; 85 SciErr strErr;
86 const char *cname = NULL; 86 const char *cname = NULL;
87 jint col = -1; 87 jint col = -1;
88 int dimension[2]; 88 int dimension[2];
@@ -145,7 +145,7 @@ JNIEXPORT jboolean JNICALL Java_javasci_SciAbstractArray_Job(JNIEnv *env, jobjec
145*/ 145*/
146JNIEXPORT void JNICALL Java_javasci_SciAbstractArray_Get(JNIEnv *env, jobject obj_this) 146JNIEXPORT void JNICALL Java_javasci_SciAbstractArray_Get(JNIEnv *env, jobject obj_this)
147{ 147{
148 StrErr strErr; 148 SciErr strErr;
149 char *signatureType = detectSignatureTypeFromObjectName(env, obj_this); 149 char *signatureType = detectSignatureTypeFromObjectName(env, obj_this);
150 150
151 jclass class_Mine = (*env)->GetObjectClass(env, obj_this); 151 jclass class_Mine = (*env)->GetObjectClass(env, obj_this);
@@ -292,7 +292,7 @@ JNIEXPORT void JNICALL Java_javasci_SciAbstractArray_Send(JNIEnv *env, jobject o
292/*--------------------------------------------------------------------------*/ 292/*--------------------------------------------------------------------------*/
293static int JNI_getMatrixOfInteger(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name) 293static int JNI_getMatrixOfInteger(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name)
294{ 294{
295 StrErr strErr; 295 SciErr strErr;
296 int i = 0; 296 int i = 0;
297 int cm = 0, cn = 0; 297 int cm = 0, cn = 0;
298 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[I"); 298 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[I");
@@ -327,7 +327,7 @@ static int JNI_getMatrixOfInteger(JNIEnv *env, jobject obj_this, jclass class_th
327/*--------------------------------------------------------------------------*/ 327/*--------------------------------------------------------------------------*/
328static int JNI_getMatrixOfDouble(JNIEnv *env, jobject obj_this, jclass class_this, char *name) 328static int JNI_getMatrixOfDouble(JNIEnv *env, jobject obj_this, jclass class_this, char *name)
329{ 329{
330 StrErr strErr; 330 SciErr strErr;
331 int cm = 0, cn = 0; 331 int cm = 0, cn = 0;
332 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[D"); 332 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[D");
333 jdoubleArray jx = (*env)->GetObjectField(env, obj_this, id_x); 333 jdoubleArray jx = (*env)->GetObjectField(env, obj_this, id_x);
@@ -348,7 +348,7 @@ static int JNI_getMatrixOfDouble(JNIEnv *env, jobject obj_this, jclass class_thi
348/*--------------------------------------------------------------------------*/ 348/*--------------------------------------------------------------------------*/
349static int JNI_getMatrixOfComplex(JNIEnv *env, jobject obj_this, jclass class_this, char *name) 349static int JNI_getMatrixOfComplex(JNIEnv *env, jobject obj_this, jclass class_this, char *name)
350{ 350{
351 StrErr strErr; 351 SciErr strErr;
352 int cm = 0, cn = 0; 352 int cm = 0, cn = 0;
353 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[D"); 353 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[D");
354 jfieldID id_y = (*env)->GetFieldID(env, class_this, "y", "[D"); 354 jfieldID id_y = (*env)->GetFieldID(env, class_this, "y", "[D");
@@ -377,7 +377,7 @@ static int JNI_getMatrixOfComplex(JNIEnv *env, jobject obj_this, jclass class_th
377/*--------------------------------------------------------------------------*/ 377/*--------------------------------------------------------------------------*/
378static int JNI_getMatrixOfString(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name) 378static int JNI_getMatrixOfString(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name)
379{ 379{
380 StrErr strErr; 380 SciErr strErr;
381 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[Ljava/lang/String;"); 381 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[Ljava/lang/String;");
382 jobjectArray jx = (*env)->GetObjectField(env, obj_this, id_x); 382 jobjectArray jx = (*env)->GetObjectField(env, obj_this, id_x);
383 383
@@ -444,7 +444,7 @@ static int JNI_getMatrixOfString(JNIEnv *env, jobject obj_this, jclass class_thi
444/*--------------------------------------------------------------------------*/ 444/*--------------------------------------------------------------------------*/
445static int JNI_getMatrixOfBoolean(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name) 445static int JNI_getMatrixOfBoolean(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name)
446{ 446{
447 StrErr strErr; 447 SciErr strErr;
448 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[Z"); 448 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[Z");
449 jbooleanArray jx = (*env)->GetObjectField(env, obj_this, id_x); 449 jbooleanArray jx = (*env)->GetObjectField(env, obj_this, id_x);
450 jboolean *cx = (*env)->GetBooleanArrayElements(env, jx, NULL); 450 jboolean *cx = (*env)->GetBooleanArrayElements(env, jx, NULL);
@@ -481,7 +481,7 @@ static int JNI_getMatrixOfBoolean(JNIEnv *env, jobject obj_this, jclass class_th
481/*--------------------------------------------------------------------------*/ 481/*--------------------------------------------------------------------------*/
482static int JNI_setMatrixOfInteger(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name) 482static int JNI_setMatrixOfInteger(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name)
483{ 483{
484 StrErr strErr; 484 SciErr strErr;
485 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[I"); 485 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[I");
486 jintArray jx = (*env)->GetObjectField(env, obj_this, id_x); 486 jintArray jx = (*env)->GetObjectField(env, obj_this, id_x);
487 jint *cx = (*env)->GetIntArrayElements(env, jx, NULL); 487 jint *cx = (*env)->GetIntArrayElements(env, jx, NULL);
@@ -518,7 +518,7 @@ static int JNI_setMatrixOfInteger(JNIEnv *env, jobject obj_this, jclass class_th
518/*--------------------------------------------------------------------------*/ 518/*--------------------------------------------------------------------------*/
519static int JNI_setMatrixOfDouble(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name) 519static int JNI_setMatrixOfDouble(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name)
520{ 520{
521 StrErr strErr; 521 SciErr strErr;
522 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[D"); 522 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[D");
523 jdoubleArray jx = (*env)->GetObjectField(env, obj_this, id_x); 523 jdoubleArray jx = (*env)->GetObjectField(env, obj_this, id_x);
524 double *cx = (*env)->GetDoubleArrayElements(env, jx, NULL); 524 double *cx = (*env)->GetDoubleArrayElements(env, jx, NULL);
@@ -538,7 +538,7 @@ static int JNI_setMatrixOfDouble(JNIEnv *env, jobject obj_this, jclass class_thi
538/*--------------------------------------------------------------------------*/ 538/*--------------------------------------------------------------------------*/
539static int JNI_setMatrixOfComplex(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name) 539static int JNI_setMatrixOfComplex(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name)
540{ 540{
541 StrErr strErr; 541 SciErr strErr;
542 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[D"); 542 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[D");
543 jfieldID id_y = (*env)->GetFieldID(env, class_this, "y", "[D"); 543 jfieldID id_y = (*env)->GetFieldID(env, class_this, "y", "[D");
544 544
@@ -565,7 +565,7 @@ static int JNI_setMatrixOfComplex(JNIEnv *env, jobject obj_this, jclass class_th
565/*--------------------------------------------------------------------------*/ 565/*--------------------------------------------------------------------------*/
566static int JNI_setMatrixOfString(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name) 566static int JNI_setMatrixOfString(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name)
567{ 567{
568 StrErr strErr; 568 SciErr strErr;
569 int i = 0; 569 int i = 0;
570 char **pStrings = NULL; 570 char **pStrings = NULL;
571 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[Ljava/lang/String;" ); 571 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[Ljava/lang/String;" );
@@ -601,7 +601,7 @@ static int JNI_setMatrixOfString(JNIEnv *env, jobject obj_this, jclass class_thi
601/*--------------------------------------------------------------------------*/ 601/*--------------------------------------------------------------------------*/
602static int JNI_setMatrixOfBoolean(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name) 602static int JNI_setMatrixOfBoolean(JNIEnv *env, jobject obj_this, jclass class_this, int Rows, int Cols, char *name)
603{ 603{
604 StrErr strErr; 604 SciErr strErr;
605 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[Z"); 605 jfieldID id_x = (*env)->GetFieldID(env, class_this, "x", "[Z");
606 jbooleanArray jx = (*env)->GetObjectField(env, obj_this, id_x); 606 jbooleanArray jx = (*env)->GetObjectField(env, obj_this, id_x);
607 jboolean *cx = (*env)->GetBooleanArrayElements(env, jx, NULL); 607 jboolean *cx = (*env)->GetBooleanArrayElements(env, jx, NULL);
diff --git a/scilab/modules/javasci/src/c/javasci_SciBooleanArray.c b/scilab/modules/javasci/src/c/javasci_SciBooleanArray.c
index 4c6dda1..522e565 100644
--- a/scilab/modules/javasci/src/c/javasci_SciBooleanArray.c
+++ b/scilab/modules/javasci/src/c/javasci_SciBooleanArray.c
@@ -20,7 +20,7 @@ JNIEXPORT jboolean JNICALL Java_javasci_SciBooleanArray_GetElement(JNIEnv *env ,
20/*! public native boolean GetElement(int indr, int indc); */ 20/*! public native boolean GetElement(int indr, int indc); */
21JNIEXPORT jboolean JNICALL Java_javasci_SciBooleanArray_GetElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg) 21JNIEXPORT jboolean JNICALL Java_javasci_SciBooleanArray_GetElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg)
22{ 22{
23 StrErr strErr; 23 SciErr strErr;
24 jboolean Value = JNI_FALSE; 24 jboolean Value = JNI_FALSE;
25 int *CX = NULL; 25 int *CX = NULL;
26 26
diff --git a/scilab/modules/javasci/src/c/javasci_SciComplexArray.c b/scilab/modules/javasci/src/c/javasci_SciComplexArray.c
index 331cc6e..5b49092 100644
--- a/scilab/modules/javasci/src/c/javasci_SciComplexArray.c
+++ b/scilab/modules/javasci/src/c/javasci_SciComplexArray.c
@@ -20,7 +20,7 @@ JNIEXPORT jdouble JNICALL Java_javasci_SciComplexArray_GetImaginaryPartElement(J
20/*--------------------------------------------------------------------------*/ 20/*--------------------------------------------------------------------------*/
21JNIEXPORT jdouble JNICALL Java_javasci_SciComplexArray_GetRealPartElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg) 21JNIEXPORT jdouble JNICALL Java_javasci_SciComplexArray_GetRealPartElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg)
22{ 22{
23 StrErr strErr; 23 SciErr strErr;
24 double Value = 0.0; 24 double Value = 0.0;
25 25
26 jclass class_Mine = (*env)->GetObjectClass(env, obj_this); 26 jclass class_Mine = (*env)->GetObjectClass(env, obj_this);
@@ -117,7 +117,7 @@ JNIEXPORT jdouble JNICALL Java_javasci_SciComplexArray_GetRealPartElement(JNIEnv
117/*! public native double GetImaginaryPartElement(int indr,int indc); */ 117/*! public native double GetImaginaryPartElement(int indr,int indc); */
118JNIEXPORT jdouble JNICALL Java_javasci_SciComplexArray_GetImaginaryPartElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg) 118JNIEXPORT jdouble JNICALL Java_javasci_SciComplexArray_GetImaginaryPartElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg)
119{ 119{
120 StrErr strErr; 120 SciErr strErr;
121 double Value = 0.0; 121 double Value = 0.0;
122 122
123 jclass class_Mine = (*env)->GetObjectClass(env, obj_this); 123 jclass class_Mine = (*env)->GetObjectClass(env, obj_this);
diff --git a/scilab/modules/javasci/src/c/javasci_SciDoubleArray.c b/scilab/modules/javasci/src/c/javasci_SciDoubleArray.c
index 1045dbe..4324f15 100644
--- a/scilab/modules/javasci/src/c/javasci_SciDoubleArray.c
+++ b/scilab/modules/javasci/src/c/javasci_SciDoubleArray.c
@@ -20,7 +20,7 @@ JNIEXPORT jdouble JNICALL Java_javasci_SciDoubleArray_GetElement(JNIEnv *env , j
20/*! public native double GetElement(int indr, int indc); */ 20/*! public native double GetElement(int indr, int indc); */
21JNIEXPORT jdouble JNICALL Java_javasci_SciDoubleArray_GetElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg) 21JNIEXPORT jdouble JNICALL Java_javasci_SciDoubleArray_GetElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg)
22{ 22{
23 StrErr strErr; 23 SciErr strErr;
24 double Value = 0.0; 24 double Value = 0.0;
25 25
26 jclass class_Mine = (*env)->GetObjectClass(env, obj_this); 26 jclass class_Mine = (*env)->GetObjectClass(env, obj_this);
diff --git a/scilab/modules/javasci/src/c/javasci_SciIntegerArray.c b/scilab/modules/javasci/src/c/javasci_SciIntegerArray.c
index cec4ad9..890ccf0 100644
--- a/scilab/modules/javasci/src/c/javasci_SciIntegerArray.c
+++ b/scilab/modules/javasci/src/c/javasci_SciIntegerArray.c
@@ -18,7 +18,7 @@ JNIEXPORT jint JNICALL Java_javasci_SciIntegerArray_GetElement(JNIEnv *env , job
18/*! public native int GetElement(int indr, int indc); */ 18/*! public native int GetElement(int indr, int indc); */
19JNIEXPORT jint JNICALL Java_javasci_SciIntegerArray_GetElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg) 19JNIEXPORT jint JNICALL Java_javasci_SciIntegerArray_GetElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg)
20{ 20{
21 StrErr strErr; 21 SciErr strErr;
22 int Value = 0; 22 int Value = 0;
23 int j = 0; 23 int j = 0;
24 24
diff --git a/scilab/modules/javasci/src/c/javasci_SciStringArray.c b/scilab/modules/javasci/src/c/javasci_SciStringArray.c
index 1c137d9..e0cb5b3 100644
--- a/scilab/modules/javasci/src/c/javasci_SciStringArray.c
+++ b/scilab/modules/javasci/src/c/javasci_SciStringArray.c
@@ -22,7 +22,7 @@ JNIEXPORT jstring JNICALL Java_javasci_SciStringArray_GetElement(JNIEnv *env , j
22/*! public native String GetElement(int indr, int indc); */ 22/*! public native String GetElement(int indr, int indc); */
23JNIEXPORT jstring JNICALL Java_javasci_SciStringArray_GetElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg) 23JNIEXPORT jstring JNICALL Java_javasci_SciStringArray_GetElement(JNIEnv *env , jobject obj_this,jint indrarg, jint indcarg)
24{ 24{
25 StrErr strErr; 25 SciErr strErr;
26 int *pLength = NULL; 26 int *pLength = NULL;
27 char **pStrings = NULL; 27 char **pStrings = NULL;
28 int cm = 0, cn = 0; 28 int cm = 0, cn = 0;
diff --git a/scilab/modules/javasci/src/c/javasci_Scilab.c b/scilab/modules/javasci/src/c/javasci_Scilab.c
index d6b005e..d927083 100644
--- a/scilab/modules/javasci/src/c/javasci_Scilab.c
+++ b/scilab/modules/javasci/src/c/javasci_Scilab.c
@@ -88,7 +88,7 @@ JNIEXPORT jboolean JNICALL Java_javasci_Scilab_Finish (JNIEnv *env , jobject obj
88/* public static native boolean ExistVar(String varName); */ 88/* public static native boolean ExistVar(String varName); */
89JNIEXPORT jboolean JNICALL Java_javasci_Scilab_ExistVar(JNIEnv *env , jclass cl, jstring varName) 89JNIEXPORT jboolean JNICALL Java_javasci_Scilab_ExistVar(JNIEnv *env , jclass cl, jstring varName)
90{ 90{
91 StrErr strErr; 91 SciErr strErr;
92 jboolean bOK = JNI_FALSE; 92 jboolean bOK = JNI_FALSE;
93 const char *cvarName = NULL; 93 const char *cvarName = NULL;
94 int sciType = 0; 94 int sciType = 0;
@@ -143,7 +143,7 @@ JNIEXPORT jboolean JNICALL Java_javasci_Scilab_ExistVar(JNIEnv *env , jclass cl,
143/* public static native int TypeVar(String varName); */ 143/* public static native int TypeVar(String varName); */
144JNIEXPORT jint JNICALL Java_javasci_Scilab_TypeVar(JNIEnv *env , jclass cl, jstring varName) 144JNIEXPORT jint JNICALL Java_javasci_Scilab_TypeVar(JNIEnv *env , jclass cl, jstring varName)
145{ 145{
146 StrErr strErr; 146 SciErr strErr;
147 jint type = -1; 147 jint type = -1;
148 const char *cvarName = (*env)->GetStringUTFChars(env, varName, NULL); 148 const char *cvarName = (*env)->GetStringUTFChars(env, varName, NULL);
149 149
diff --git a/scilab/modules/javasci/src/c/javasci_Scilab2.c b/scilab/modules/javasci/src/c/javasci_Scilab2.c
index 837bf55..e015851 100644
--- a/scilab/modules/javasci/src/c/javasci_Scilab2.c
+++ b/scilab/modules/javasci/src/c/javasci_Scilab2.c
@@ -36,7 +36,7 @@ JNIEXPORT void JNICALL Java_javasci_Scilab_initialize(JNIEnv *env, jclass cl)
36/*--------------------------------------------------------------------------*/ 36/*--------------------------------------------------------------------------*/
37JNIEXPORT void JNICALL Java_javasci_Scilab_sendDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix) 37JNIEXPORT void JNICALL Java_javasci_Scilab_sendDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix)
38{ 38{
39 StrErr strErr; 39 SciErr strErr;
40 const char *cname = NULL; 40 const char *cname = NULL;
41 double *matrix = NULL; 41 double *matrix = NULL;
42 int nbRow = 0, nbCol = 0; 42 int nbRow = 0, nbCol = 0;
@@ -72,7 +72,7 @@ JNIEXPORT void JNICALL Java_javasci_Scilab_sendDoubleMatrix (JNIEnv *env, jclass
72/*--------------------------------------------------------------------------*/ 72/*--------------------------------------------------------------------------*/
73JNIEXPORT void JNICALL Java_javasci_Scilab_receiveDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix) 73JNIEXPORT void JNICALL Java_javasci_Scilab_receiveDoubleMatrix (JNIEnv *env, jclass cl, jobject objMatrix)
74{ 74{
75 StrErr strErr; 75 SciErr strErr;
76 const char *cname = NULL; 76 const char *cname = NULL;
77 double *matrix = NULL; 77 double *matrix = NULL;
78 int nbRow = 0, nbCol = 0; 78 int nbRow = 0, nbCol = 0;
@@ -132,7 +132,7 @@ JNIEXPORT void JNICALL Java_javasci_Scilab_receiveDoubleMatrix (JNIEnv *env, jcl
132/*--------------------------------------------------------------------------*/ 132/*--------------------------------------------------------------------------*/
133JNIEXPORT void JNICALL Java_javasci_Scilab_sendComplexMatrix (JNIEnv *env, jclass cl, jobject objMatrix) 133JNIEXPORT void JNICALL Java_javasci_Scilab_sendComplexMatrix (JNIEnv *env, jclass cl, jobject objMatrix)
134{ 134{
135 StrErr strErr; 135 SciErr strErr;
136 const char *cname = NULL; 136 const char *cname = NULL;
137 double *cx = NULL, *cy = NULL; 137 double *cx = NULL, *cy = NULL;
138 int nbRow = 0, nbCol = 0; 138 int nbRow = 0, nbCol = 0;
@@ -172,7 +172,7 @@ JNIEXPORT void JNICALL Java_javasci_Scilab_sendComplexMatrix (JNIEnv *env, jclas
172/*--------------------------------------------------------------------------*/ 172/*--------------------------------------------------------------------------*/
173JNIEXPORT void JNICALL Java_javasci_Scilab_receiveComplexMatrix (JNIEnv *env, jclass cl, jobject objMatrix) 173JNIEXPORT void JNICALL Java_javasci_Scilab_receiveComplexMatrix (JNIEnv *env, jclass cl, jobject objMatrix)
174{ 174{
175 StrErr strErr; 175 SciErr strErr;
176 const char *cname = NULL; 176 const char *cname = NULL;
177 double *cx = NULL, *cy = NULL; 177 double *cx = NULL, *cy = NULL;
178 int nbRow = 0, nbCol = 0; 178 int nbRow = 0, nbCol = 0;
@@ -287,7 +287,7 @@ JNIEXPORT void JNICALL Java_javasci_Scilab_sendStringMatrix (JNIEnv *env, jclass
287/*--------------------------------------------------------------------------*/ 287/*--------------------------------------------------------------------------*/
288JNIEXPORT void JNICALL Java_javasci_Scilab_receiveStringMatrix (JNIEnv *env, jclass cl, jobject objMatrix) 288JNIEXPORT void JNICALL Java_javasci_Scilab_receiveStringMatrix (JNIEnv *env, jclass cl, jobject objMatrix)
289{ 289{
290 StrErr strErr; 290 SciErr strErr;
291 const char *cname = NULL; 291 const char *cname = NULL;
292 int nbRow = 0, nbCol = 0; 292 int nbRow = 0, nbCol = 0;
293 int i = 0; 293 int i = 0;
@@ -415,7 +415,7 @@ static jobject getStringMatrix(JNIEnv *env, jclass cl, jstring name, jint nbRow
415/*--------------------------------------------------------------------------*/ 415/*--------------------------------------------------------------------------*/
416JNIEXPORT jobject JNICALL Java_javasci_Scilab_receiveDataByName (JNIEnv *env, jclass cl, jstring name) 416JNIEXPORT jobject JNICALL Java_javasci_Scilab_receiveDataByName (JNIEnv *env, jclass cl, jstring name)
417{ 417{
418 StrErr strErr; 418 SciErr strErr;
419 const char *cname = NULL; 419 const char *cname = NULL;
420 jobject obj = NULL; 420 jobject obj = NULL;
421 int type = 0; 421 int type = 0;