Mercurial > hg > octave-avbm
changeset 6970:3113e481833f
[project @ 2007-10-07 02:50:26 by jwe]
author | jwe |
---|---|
date | Sun, 07 Oct 2007 02:50:27 +0000 |
parents | 0a64abe792f4 |
children | 0a9d97cf2e13 |
files | src/ChangeLog src/oct-stream.cc |
diffstat | 2 files changed, 6 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2007-10-06 John W. Eaton <jwe@octave.org> + * oct-stream.cc (octave_base_stream::do_scanf): + Always allow MVAL to re resized if NR > 0. + (FINISH_CHARACTER_CONVERSION): Likewise. + * mappers.cc (install_mapper_functions): Undo previous change. Fix doc string for lgamma. (xzlgamma): Delete.
--- a/src/oct-stream.cc +++ b/src/oct-stream.cc @@ -1618,12 +1618,7 @@ panic_impossible (); \ } \ else if (nr > 0) \ - { \ - if (nc <= 0) \ - mval.resize (nr, max_size / nr, 0.0); \ - else \ - panic_impossible (); \ - } \ + mval.resize (nr, max_size / nr, 0.0); \ else \ mval.resize (max_size, 1, 0.0); \ \ @@ -1768,12 +1763,7 @@ panic_impossible (); } else if (nr > 0) - { - if (nc <= 0) - mval.resize (nr, max_size / nr, 0.0); - else - panic_impossible (); - } + mval.resize (nr, max_size / nr, 0.0); else mval.resize (max_size, 1, 0.0);