summaryrefslogtreecommitdiffstats
path: root/scilab/modules/io
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-02-04 16:11:00 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-02-04 16:11:00 +0100
commit12c46edbc61501d031e9662b5556ecfa8ff8955d (patch)
treedaddfbbe5d2e5c670a53eb95ee9aadbad8377a69 /scilab/modules/io
parent5f99c8a201bbf5ebd899a2bceffa76560cc453ab (diff)
downloadscilab-12c46edbc61501d031e9662b5556ecfa8ff8955d.zip
scilab-12c46edbc61501d031e9662b5556ecfa8ff8955d.tar.gz
bug 6556
Diffstat (limited to 'scilab/modules/io')
-rw-r--r--scilab/modules/io/sci_gateway/c/sci_file.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/scilab/modules/io/sci_gateway/c/sci_file.c b/scilab/modules/io/sci_gateway/c/sci_file.c
index 0c3b27a..e6f644e 100644
--- a/scilab/modules/io/sci_gateway/c/sci_file.c
+++ b/scilab/modules/io/sci_gateway/c/sci_file.c
@@ -295,7 +295,7 @@ static int sci_file_no_rhs(char *fname)
295 int m_out = 0, n_out = 0; 295 int m_out = 0, n_out = 0;
296 296
297 int sizeArray = 0; 297 int sizeArray = 0;
298 int *IdUsed = NULL; 298 double *IdUsed = NULL;
299 299
300 CheckLhs(0,5); 300 CheckLhs(0,5);
301 301
@@ -306,7 +306,7 @@ static int sci_file_no_rhs(char *fname)
306 { 306 {
307 m_out = 1; 307 m_out = 1;
308 n_out = sizeArray; 308 n_out = sizeArray;
309 sciErr = createMatrixOfInteger32(pvApiCtx, Rhs + 1, m_out, n_out, IdUsed); 309 sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 1, m_out, n_out, IdUsed);
310 FREE(IdUsed); 310 FREE(IdUsed);
311 IdUsed = NULL; 311 IdUsed = NULL;
312 312
@@ -361,12 +361,12 @@ static int sci_file_no_rhs(char *fname)
361 361
362 if (Lhs > 3) /* mod */ 362 if (Lhs > 3) /* mod */
363 { 363 {
364 int *Modes = GetModesUsed(&sizeArray); 364 double *Modes = GetModesUsed(&sizeArray);
365 if (Modes) 365 if (Modes)
366 { 366 {
367 m_out = 1; 367 m_out = 1;
368 n_out = sizeArray; 368 n_out = sizeArray;
369 sciErr = createMatrixOfInteger32(pvApiCtx, Rhs + 4, m_out, n_out, Modes); 369 sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 4, m_out, n_out, Modes);
370 FREE(Modes); 370 FREE(Modes);
371 Modes = NULL; 371 Modes = NULL;
372 if(sciErr.iErr) 372 if(sciErr.iErr)
@@ -381,12 +381,12 @@ static int sci_file_no_rhs(char *fname)
381 381
382 if (Lhs > 4) /* swap */ 382 if (Lhs > 4) /* swap */
383 { 383 {
384 int *SwapId = GetSwapsUsed(&sizeArray); 384 double *SwapId = GetSwapsUsed(&sizeArray);
385 if (SwapId) 385 if (SwapId)
386 { 386 {
387 m_out = 1; 387 m_out = 1;
388 n_out = sizeArray; 388 n_out = sizeArray;
389 sciErr = createMatrixOfInteger32(pvApiCtx, Rhs + 5, m_out, n_out, SwapId); 389 sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 5, m_out, n_out, SwapId);
390 FREE(SwapId); 390 FREE(SwapId);
391 SwapId = NULL; 391 SwapId = NULL;
392 392
@@ -465,7 +465,7 @@ static int sci_file_one_rhs(char *fname)
465 { 465 {
466 m_out = 1; 466 m_out = 1;
467 n_out = 1; 467 n_out = 1;
468 sciErr = createMatrixOfInteger32(pvApiCtx, Rhs + 1, m_out, n_out, &iID); 468 sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 1, m_out, n_out, pdVarOne);
469 } 469 }
470 else 470 else
471 { 471 {
@@ -552,10 +552,10 @@ static int sci_file_one_rhs(char *fname)
552 { 552 {
553 if (GetFileTypeOpenedInScilab(iID) != 0) 553 if (GetFileTypeOpenedInScilab(iID) != 0)
554 { 554 {
555 int ModeId = GetFileModeOpenedInScilab(iID); 555 double ModeId = (double)GetFileModeOpenedInScilab(iID);
556 m_out = 1; 556 m_out = 1;
557 n_out = 1; 557 n_out = 1;
558 sciErr = createMatrixOfInteger32(pvApiCtx, Rhs + 4, m_out, n_out, &ModeId); 558 sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 4, m_out, n_out, &ModeId);
559 } 559 }
560 else 560 else
561 { 561 {
@@ -578,10 +578,10 @@ static int sci_file_one_rhs(char *fname)
578 { 578 {
579 if (GetFileTypeOpenedInScilab(iID) != 0) 579 if (GetFileTypeOpenedInScilab(iID) != 0)
580 { 580 {
581 int SwapId = GetSwapStatus(iID); 581 double SwapId = (double)GetSwapStatus(iID);
582 m_out = 1; 582 m_out = 1;
583 n_out = 1; 583 n_out = 1;
584 sciErr = createMatrixOfInteger32(pvApiCtx, Rhs + 5, m_out, n_out, &SwapId); 584 sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 5, m_out, n_out, &SwapId);
585 } 585 }
586 else 586 else
587 { 587 {