Mercurial > octave-nkf
changeset 7605:48488cca0006
Fix for array indexing if original matrix is empty
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Wed, 19 Mar 2008 14:12:57 -0400 |
| parents | 90c9038170bf |
| children | 704b7a1098d0 |
| files | liboctave/Array.cc liboctave/ChangeLog |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.cc Wed Mar 19 13:11:50 2008 -0400 +++ b/liboctave/Array.cc Wed Mar 19 14:12:57 2008 -0400 @@ -3283,7 +3283,7 @@ if (nelem >= 1 && ((k < rhs_dims.length () && nelem == rhs_dims(k)) - || rhs_is_scalar)) + || rhs_is_scalar) || ! idx(i).is_colon()) k++; else if (! (nelem == 1 || rhs_is_scalar)) {
--- a/liboctave/ChangeLog Wed Mar 19 13:11:50 2008 -0400 +++ b/liboctave/ChangeLog Wed Mar 19 14:12:57 2008 -0400 @@ -1,5 +1,8 @@ 2008-03-19 David Bateman <dbateman@free.fr> + * Array.cc (assignN): If orig_empty allow assignment like + a(1:10,1)=1:10 + * Sparse.h (template <class U, class F> Sparse<U> map (F fcn) const): New template function. * MSparse.h (template <class U, class F> MSparse<U> map (F fcn)