Mercurial > octave-nkf
changeset 4709:cf141edca935
[project @ 2004-01-22 18:10:53 by jwe]
| author | jwe |
|---|---|
| date | Thu, 22 Jan 2004 18:10:53 +0000 |
| parents | e5639a6586c4 |
| children | 48191fcee04d |
| files | liboctave/Array.cc liboctave/ChangeLog |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.cc Thu Jan 22 17:59:28 2004 +0000 +++ b/liboctave/Array.cc Thu Jan 22 18:10:53 2004 +0000 @@ -843,15 +843,15 @@ int old_len = length (); int len = get_size (dv); - + rep = new typename Array<T>::ArrayRep (len); dim_vector dv_old = dimensions; - + if (n > dv_old.length ()) { dv_old.resize (n); - + for (int i = dv_old.length (); i < n; i++) dv_old.elem (i) = 1; } @@ -2246,14 +2246,14 @@ if (rhs.length () > 2) { dim_vector dv_tmp = rhs.squeeze().dims (); - + switch (dv_tmp.length ()) { case 1: if (rhs_nr == 1) rhs_nc = dv_tmp.elem (0); break; - + case 2: rhs_nr = dv_tmp.elem (0); rhs_nc = dv_tmp.elem (1); @@ -2262,7 +2262,7 @@ default: (*current_liboctave_error_handler) ("Array<T>::assign2: Dimension mismatch"); - return 0; + return 0; } }
--- a/liboctave/ChangeLog Thu Jan 22 17:59:28 2004 +0000 +++ b/liboctave/ChangeLog Thu Jan 22 18:10:53 2004 +0000 @@ -1,7 +1,7 @@ 2004-01-22 Petter Risholm <risholm@stud.ntnu.no> - * Array.cc (Array<T>::assign2): Check for RHS dimensions larger - than 2. + * Array.cc (Array<T>::resize_and_fill): Correctly copy old elements. + (Array<T>::assign2): Check for RHS dimensions larger than 2. 2004-01-21 Petter Risholm <risholm@stud.ntnu.no>