Mercurial > octave-nkf
changeset 5342:f9ab8e67ce7a
[project @ 2005-05-06 17:35:41 by jwe]
| author | jwe |
|---|---|
| date | Fri, 06 May 2005 17:35:41 +0000 |
| parents | 4bea82210dcd |
| children | be0bd7a760c9 |
| files | src/ChangeLog src/ov-struct.cc |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri May 06 17:11:47 2005 +0000 +++ b/src/ChangeLog Fri May 06 17:35:41 2005 +0000 @@ -3,6 +3,8 @@ * ov-struct.cc (octave_struct::save_ascii, octave_struct::save_binary, octave_sruct::save_hdf5): Always save cell array. + (octave_struct::load_ascii, octave_struct::load_binary, + octave_sruct::load_hdf5): Try to read old-style files correctly. * DLD-FUNCTIONS/__qp__.cc (qp): Use chol2inv to compute inverse from Cholesky factors.
--- a/src/ov-struct.cc Fri May 06 17:11:47 2005 +0000 +++ b/src/ov-struct.cc Fri May 06 17:35:41 2005 +0000 @@ -1025,7 +1025,8 @@ if (!is) break; - Cell tcell = t2.cell_value (); + // Try for some backward compatibility... + Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); if (error_state) { @@ -1109,7 +1110,8 @@ if (!is) break; - Cell tcell = t2.cell_value (); + // Try for some backward compatibility... + Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); if (error_state) { @@ -1192,7 +1194,10 @@ hdf5_read_next_data, &dsub)) > 0) #endif { - Cell tcell = dsub.tc.cell_value (); + octave_value t2 = dsub.tc; + + // Try for some backward compatibility... + Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); if (error_state) {