# HG changeset patch # User jwe # Date 1194371718 0 # Node ID a53649dc07b64f988485f80b4cf6729b3c2d90de # Parent b26d0cd10a424d2fa7b034a9135b5af269a360b1 [project @ 2007-11-06 17:55:17 by jwe] diff -r b26d0cd10a42 -r a53649dc07b6 src/ChangeLog --- a/src/ChangeLog Tue Nov 06 17:18:41 2007 +0000 +++ b/src/ChangeLog Tue Nov 06 17:55:18 2007 +0000 @@ -1,3 +1,9 @@ +2007-11-06 David Bateman + + * OPERATORS/op-bm-bm.cc (matrix_to_bool_matrix, + scalar_to_bool_matrix): New type conversion functions. + (install_bm_bm_ops): Install new type conversions functions. + 2007-11-06 Michael Goffioul * toplev.cc (Fsystem) [__WIN32__ && ! __CYGWIN__]: diff -r b26d0cd10a42 -r a53649dc07b6 src/OPERATORS/op-bm-bm.cc --- a/src/OPERATORS/op-bm-bm.cc Tue Nov 06 17:18:41 2007 +0000 +++ b/src/OPERATORS/op-bm-bm.cc Tue Nov 06 17:55:18 2007 +0000 @@ -29,6 +29,7 @@ #include "oct-obj.h" #include "ov.h" #include "ov-bool-mat.h" +#include "ov-scalar.h" #include "ov-range.h" #include "ov-re-mat.h" #include "ov-re-sparse.h" @@ -100,6 +101,9 @@ return octave_value (); } +DEFCONVFN (matrix_to_bool_matrix, matrix, bool) +DEFCONVFN (scalar_to_bool_matrix, scalar, bool) + void install_bm_bm_ops (void) { @@ -119,6 +123,9 @@ INSTALL_CATOP (octave_bool_matrix, octave_matrix, bm_m); INSTALL_CATOP (octave_matrix, octave_bool_matrix, m_bm); + INSTALL_CONVOP (octave_matrix, octave_bool_matrix, matrix_to_bool_matrix); + INSTALL_CONVOP (octave_scalar, octave_bool_matrix, scalar_to_bool_matrix); + INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_bool_matrix, assign); INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_matrix, conv_and_assign);