Mercurial > hg > octave-max
changeset 11702:802f5890bf5d release-3-0-x
Fix for array indexing if original matrix is empty
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Wed, 19 Mar 2008 14:13:37 -0400 |
| parents | b537a643a7cf |
| children | 7d65596343b8 |
| files | liboctave/Array.cc liboctave/ChangeLog |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.cc +++ b/liboctave/Array.cc @@ -3111,7 +3111,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 +++ b/liboctave/ChangeLog @@ -1,3 +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 + 2008-03-18 David Bateman <dbateman@free.fr> * dNDArray.cc (NDArray::min, NDArraymax): chop trailing singletons.