Mercurial > octave-nkf
changeset 5327:68eae0f668c4
[project @ 2005-05-02 08:57:21 by dbateman]
| author | dbateman |
|---|---|
| date | Mon, 02 May 2005 08:57:21 +0000 |
| parents | 4f5faf0fd322 |
| children | 322ab0da00f8 |
| files | src/ChangeLog src/ov-cx-sparse.cc src/ov-re-sparse.cc |
| diffstat | 3 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Apr 29 21:30:40 2005 +0000 +++ b/src/ChangeLog Mon May 02 08:57:21 2005 +0000 @@ -1,3 +1,8 @@ +2005-05-02 David Bateman <dbateman@free.fr> + + * ov-re-sparse.cc, ov-cx-sparse.cc (load_binary): read save_type into + one byte variable. + 2005-04-29 John W. Eaton <jwe@octave.org> * oct-stream.cc (DO_LITERAL_CONVERSION): Cast fmt[i] to unsigned
--- a/src/ov-cx-sparse.cc Fri Apr 29 21:30:40 2005 +0000 +++ b/src/ov-cx-sparse.cc Mon May 02 08:57:21 2005 +0000 @@ -271,6 +271,8 @@ oct_mach_info::float_format fmt) { FOUR_BYTE_INT nz, nc, nr, tmp; + char ctmp; + if (! is.read (X_CAST (char *, &tmp), 4)) return false; @@ -320,10 +322,10 @@ m.ridx(i) = tmp; } - if (! is.read (X_CAST (char *, &tmp), 1)) + if (! is.read (X_CAST (char *, &ctmp), 1)) return false; - read_doubles (is, X_CAST(double *, m.data()), X_CAST (save_type, tmp), + read_doubles (is, X_CAST(double *, m.data()), X_CAST (save_type, ctmp), 2 * nz, swap, fmt); if (error_state || ! is)
--- a/src/ov-re-sparse.cc Fri Apr 29 21:30:40 2005 +0000 +++ b/src/ov-re-sparse.cc Mon May 02 08:57:21 2005 +0000 @@ -316,6 +316,8 @@ oct_mach_info::float_format fmt) { FOUR_BYTE_INT nz, nc, nr, tmp; + char ctmp; + if (! is.read (X_CAST (char *, &tmp), 4)) return false; @@ -365,11 +367,10 @@ m.xridx(i) = tmp; } - if (! is.read (X_CAST (char *, &tmp), 1)) + if (! is.read (X_CAST (char *, &ctmp), 1)) return false; - double *re = m.xdata (); - read_doubles (is, re, X_CAST (save_type, tmp), nz, swap, fmt); + read_doubles (is, m.xdata (), X_CAST (save_type, ctmp), nz, swap, fmt); if (error_state || ! is) return false;