Mercurial > hg > octave-nkf
diff src/graphics.cc @ 12587:c3d4542a4f06 stable
graphics.cc: Allow ishandle() to accept vector of handles (bug 33025).
author | John Eaton <jwe@octave.org> |
---|---|
date | Sun, 10 Apr 2011 11:46:50 -0400 |
parents | 570193964185 |
children | 69cd5ebe5fb5 c7512d0d52e8 |
line wrap: on
line diff
--- a/src/graphics.cc +++ b/src/graphics.cc @@ -2011,23 +2011,18 @@ if (val.is_real_scalar () && is_handle (val.double_value ())) retval = true; - else if (val.is_real_matrix ()) - { - if (val.is_string ()) - retval = boolNDArray (val.dims (), false); - else - { - const NDArray handles = val.array_value (); - - if (! error_state) - { - boolNDArray result (handles.dims ()); - - for (octave_idx_type i = 0; i < handles.numel (); i++) - result.xelem (i) = is_handle (handles (i)); - - retval = result; - } + else if (val.is_numeric_type () && val.is_real_type ()) + { + const NDArray handles = val.array_value (); + + if (! error_state) + { + boolNDArray result (handles.dims ()); + + for (octave_idx_type i = 0; i < handles.numel (); i++) + result.xelem (i) = is_handle (handles (i)); + + retval = result; } }