# HG changeset patch # User Jaroslav Hajek # Date 1250691873 -7200 # Node ID ed34b1da0e26f466d2e61de6f0512bb30334e2a7 # Parent e5f7aee2ab8c11da4809b0c28311e4149cc7a915 zero matrix assignment fix diff --git a/liboctave/Array-util.cc b/liboctave/Array-util.cc --- a/liboctave/Array-util.cc +++ b/liboctave/Array-util.cc @@ -455,6 +455,12 @@ rdv(0) = rhdv(0); rdv(1) = rhdv(1); } + else if (rhdv.length () == 2 + && ! i.is_scalar () && ! j.is_scalar ()) + { + rdv(0) = icol ? rhdv(0) : i.extent (0); + rdv(1) = jcol ? rhdv(1) : j.extent (0); + } else { dim_vector rhdv0 = rhdv; diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog --- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +2009-08-19 Jaroslav Hajek + + * Array-util.cc (zero_dims_inquire): Add matching ndims case. + 2009-08-19 Jaroslav Hajek * MArrayN.cc (operator+=, operator-=): Test matching dimensions first.