Mercurial > hg > octave-max

changeset 8754:900a5bf52309

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix invalid conversion error on implicit demotion of n-d arrays
author Jaroslav Hajek <highegg@gmail.com>
date Mon, 16 Feb 2009 10:40:10 +0100
parents c141078e083a
children 59c0fde890a0
files src/ChangeLog src/ov-re-mat.cc
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,9 @@
 2009-02-16  Jaroslav Hajek  <highegg@gmail.com>
 
-	* ov-base-mat (octave_base_matrix<MT>::assign (const octave_value_list&,
+	* ov-base-mat.cc (octave_base_matrix<MT>::assign (const octave_value_list&,
 	typename MT::element_type): Fix invalid index.
+	* ov-re-mat.cc (default_numeric_demotion_function): Use
+	float_array_value instead of float_matrix_value.
 
 2009-02-16  John W. Eaton  <jwe@octave.org>
 
--- a/src/ov-re-mat.cc
+++ b/src/ov-re-mat.cc
@@ -82,7 +82,7 @@
 {
   CAST_CONV_ARG (const octave_matrix&);
 
-  return new octave_float_matrix (v.float_matrix_value ());
+  return new octave_float_matrix (v.float_array_value ());
 }
 
 octave_base_value::type_conv_info