Mercurial > octave-nkf
changeset 5256:418771cb5ab2
[project @ 2005-03-29 18:48:53 by jwe]
| author | jwe |
|---|---|
| date | Tue, 29 Mar 2005 18:48:53 +0000 |
| parents | 3c4237738c3e |
| children | d957f0ef5aa3 |
| files | src/ChangeLog src/load-save.cc |
| diffstat | 2 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Mar 29 18:35:32 2005 +0000 +++ b/src/ChangeLog Tue Mar 29 18:48:53 2005 +0000 @@ -1,5 +1,7 @@ 2005-03-29 John W. Eaton <jwe@octave.org> + * load-save.cc (Fload, Fsave): Also accept -V4 option. + * ls-hdf5.h (hdf5_fstreambase::hdf5_fstreambase, hdf5_fstreambase::open): Use & instead of == to test whether mode is std::ios::in or std::ios::out.
--- a/src/load-save.cc Tue Mar 29 18:35:32 2005 +0000 +++ b/src/load-save.cc Tue Mar 29 18:48:53 2005 +0000 @@ -588,9 +588,13 @@ \n\ @item -mat\n\ @itemx -mat-binary\n\ -Force Octave to assume the file is in @sc{Matlab}'s binary format.\n\ +Force Octave to assume the file is in @sc{Matlab}'s version 6 binary\n\ +format.\n\ \n\ -@item -mat4-binary\n\ +@item -V4\n\ +@itemx -v4\n\ +@itemx -4\n\ +@itemx -mat4-binary\n\ Force Octave to assume the file is in the binary format written by\n\ @sc{Matlab} version 4.\n\ \n\ @@ -666,7 +670,8 @@ { format = LS_MAT5_BINARY; } - else if (argv[i] == "-mat4-binary" || argv[i] == "-4" || argv[i] == "-v4") + else if (argv[i] == "-mat4-binary" || argv[i] == "-V4" + || argv[i] == "-v4" || argv[i] == "-4") { format = LS_MAT_BINARY; } @@ -1235,7 +1240,10 @@ @itemx -mat-binary\n\ Save the data in @sc{Matlab}'s binary data format.\n\ \n\ -@item -mat4-binary\n\ +@item -V4\n\ +@itemx -v4\n\ +@itemx -4\n\ +@itemx -mat4-binary\n\ Save the data in the binary format written by @sc{Matlab} version 4.\n\ \n\ @item -hdf5\n\ @@ -1348,7 +1356,8 @@ { format = LS_MAT5_BINARY; } - else if (argv[i] == "-mat4-binary" || argv[i] == "-4" || argv[i] == "-v4") + else if (argv[i] == "-mat4-binary" || argv[i] == "-V4" + || argv[i] == "-v4" || argv[i] == "-4") { format = LS_MAT_BINARY; }