summaryrefslogtreecommitdiffstats
path: root/scilab/modules/io
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
commit10963c0a56109ddafb6f2f4a8dbdc925b00ac69c (patch)
tree9f8eefbac0a88917328855a3cf4c046f4e7ca719 /scilab/modules/io
parentbc7b15143690a57f6ee6d6ec9401227e77b18db4 (diff)
parentc8b337d77b6d3f040afc6a76b9c607a838ae62dd (diff)
downloadscilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.zip
scilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/CHANGES_5.3.X scilab/configure scilab/configure.ac
Diffstat (limited to 'scilab/modules/io')
-rw-r--r--scilab/modules/io/Makefile.in1
-rw-r--r--scilab/modules/io/help/en_US/file.xml17
-rw-r--r--scilab/modules/io/help/pt_BR/file.xml10
-rw-r--r--scilab/modules/io/sci_gateway/c/sci_file.c22
4 files changed, 24 insertions, 26 deletions
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index ca3907f..5337608 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -264,6 +264,7 @@ LD = @LD@
264LDFLAGS = @LDFLAGS@ 264LDFLAGS = @LDFLAGS@
265LIBICONV = @LIBICONV@ 265LIBICONV = @LIBICONV@
266LIBINTL = @LIBINTL@ 266LIBINTL = @LIBINTL@
267LIBM = @LIBM@
267LIBOBJS = @LIBOBJS@ 268LIBOBJS = @LIBOBJS@
268LIBS = @LIBS@ 269LIBS = @LIBS@
269LIBTOOL = @LIBTOOL@ 270LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/io/help/en_US/file.xml b/scilab/modules/io/help/en_US/file.xml
index 5808567..233944b 100644
--- a/scilab/modules/io/help/en_US/file.xml
+++ b/scilab/modules/io/help/en_US/file.xml
@@ -233,14 +233,13 @@ file(action,unit)
233 <listitem> 233 <listitem>
234 <variablelist> 234 <variablelist>
235 <varlistentry> 235 <varlistentry>
236 <varlistentry>
236 <term>a</term> 237 <term>a</term>
237 238
238 <listitem> 239 <listitem>
239 <para>is 1 if file has been opened with a "b" (binary) 240 <para>1 stands for "r" (read), 2 stands for "w" (write)
240 mode</para> 241 and 3 for "a" (append)</para>
241 </listitem> 242 </listitem>
242 </varlistentry>
243
244 <varlistentry> 243 <varlistentry>
245 <term>b</term> 244 <term>b</term>
246 245
@@ -249,15 +248,15 @@ file(action,unit)
249 mode</para> 248 mode</para>
250 </listitem> 249 </listitem>
251 </varlistentry> 250 </varlistentry>
252 251 </varlistentry>
253 <varlistentry> 252 <term>b</term>
254 <term>c</term>
255 253
256 <listitem> 254 <listitem>
257 <para>1 stands for "r" (read), 2 stands for "w" (write) 255 <para>is 1 if file has been opened with a "b" (binary)
258 and 3 for "a" (append)</para> 256 mode</para>
259 </listitem> 257 </listitem>
260 </varlistentry> 258 </varlistentry>
259
261 </variablelist> 260 </variablelist>
262 </listitem> 261 </listitem>
263 </varlistentry> 262 </varlistentry>
diff --git a/scilab/modules/io/help/pt_BR/file.xml b/scilab/modules/io/help/pt_BR/file.xml
index 85db09a..48200ab 100644
--- a/scilab/modules/io/help/pt_BR/file.xml
+++ b/scilab/modules/io/help/pt_BR/file.xml
@@ -237,11 +237,10 @@ file(action,unit)
237 <term>a</term> 237 <term>a</term>
238 238
239 <listitem> 239 <listitem>
240 <para>é 1 se o arquivo foi aberto pelo modo "b" 240 <para>1 significa "r" (leitura), 2 significa "w"
241 (binário)</para> 241 (escrita) e 3 significa "a" (anexação)</para>
242 </listitem> 242 </listitem>
243 </varlistentry> 243 </varlistentry>
244
245 <varlistentry> 244 <varlistentry>
246 <term>b</term> 245 <term>b</term>
247 246
@@ -250,13 +249,12 @@ file(action,unit)
250 (atualização)</para> 249 (atualização)</para>
251 </listitem> 250 </listitem>
252 </varlistentry> 251 </varlistentry>
253
254 <varlistentry> 252 <varlistentry>
255 <term>c</term> 253 <term>c</term>
256 254
257 <listitem> 255 <listitem>
258 <para>1 significa "r" (leitura), 2 significa "w" 256 <para>é 1 se o arquivo foi aberto pelo modo "b"
259 (escrita) e 3 significa "a" (anexação)</para> 257 (binário)</para>
260 </listitem> 258 </listitem>
261 </varlistentry> 259 </varlistentry>
262 </variablelist> 260 </variablelist>
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 {