Mercurial > octave
comparison liboctave/Array-util.cc @ 12067:310063a87407 release-3-2-x
zero matrix assignment fix
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Sun, 23 Aug 2009 11:12:35 +0200 |
parents | 864805896876 |
children |
comparison
equal
deleted
inserted
replaced
12066:634697062fe1 | 12067:310063a87407 |
---|---|
452 dim_vector rdv; | 452 dim_vector rdv; |
453 if (icol && jcol && rhdv.length () == 2) | 453 if (icol && jcol && rhdv.length () == 2) |
454 { | 454 { |
455 rdv(0) = rhdv(0); | 455 rdv(0) = rhdv(0); |
456 rdv(1) = rhdv(1); | 456 rdv(1) = rhdv(1); |
457 } | |
458 else if (rhdv.length () == 2 | |
459 && ! i.is_scalar () && ! j.is_scalar ()) | |
460 { | |
461 rdv(0) = icol ? rhdv(0) : i.extent (0); | |
462 rdv(1) = jcol ? rhdv(1) : j.extent (0); | |
457 } | 463 } |
458 else | 464 else |
459 { | 465 { |
460 dim_vector rhdv0 = rhdv; | 466 dim_vector rhdv0 = rhdv; |
461 rhdv0.chop_all_singletons (); | 467 rhdv0.chop_all_singletons (); |