Mercurial > hg > octave-nkf
diff liboctave/Array.cc @ 4716:fe25e290fafb
[project @ 2004-01-23 03:09:59 by jwe]
| author | jwe |
|---|---|
| date | Fri, 23 Jan 2004 03:09:59 +0000 |
| parents | 5101dffb4178 |
| children | 80156474b068 |
line wrap: on
line diff
--- a/liboctave/Array.cc +++ b/liboctave/Array.cc @@ -2496,16 +2496,14 @@ } } } - else if (rhs_nr == 1 && rhs_nc == 1 && len <= lhs_nr * lhs_nc) + else if (rhs_nr == 1 && rhs_nc == 1) { RT scalar = rhs.elem (0, 0); for (int i = 0; i < len; i++) { int ii = idx_i.elem (i); - int fr = ii % lhs_nr; - int fc = (ii - fr) / lhs_nr; - lhs.elem (fr, fc) = scalar; + lhs.elem (ii) = scalar; } } else @@ -2642,7 +2640,7 @@ lhs.elem (ii) = rhs.elem (i); } } - else if (rhs_is_scalar && len <= lhs_len) + else if (rhs_is_scalar) { RT scalar = rhs.elem (0);