Mercurial > octave-nkf
changeset 9848:6867676107f3
fix merge
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Fri, 20 Nov 2009 14:43:38 +0100 |
parents | 131d8c70920a |
children | 87fd803c583b |
files | src/ChangeLog src/data.cc |
diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Nov 22 16:47:39 2009 -0500 +++ b/src/ChangeLog Fri Nov 20 14:43:38 2009 +0100 @@ -1,3 +1,7 @@ +2009-11-20 Jaroslav Hajek <highegg@gmail.com> + + * data.cc (Fmerge): Correct query for logical masks. + 2009-11-20 Jaroslav Hajek <highegg@gmail.com> * utils.cc (dims_to_numel): Fallback to index_vector query for
--- a/src/data.cc Sun Nov 22 16:47:39 2009 -0500 +++ b/src/data.cc Fri Nov 20 14:43:38 2009 +0100 @@ -6491,7 +6491,7 @@ int nargin = args.length (); octave_value retval; - if (nargin == 3 && args(0).is_numeric_type ()) + if (nargin == 3 && args(0).is_bool_type () || args(0).is_numeric_type ()) { octave_value mask_val = args(0);