changeset 7324:4e36579df31c

[project @ 2007-12-19 16:57:21 by jwe]
author jwe
date Wed, 19 Dec 2007 16:57:21 +0000
parents c5bf3e423b34
children 67aef14de9c2
files doc/interpreter/contributors.in src/ChangeLog src/OPERATORS/op-scm-cs.cc
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/contributors.in	Wed Dec 19 06:05:58 2007 +0000
+++ b/doc/interpreter/contributors.in	Wed Dec 19 16:57:21 2007 +0000
@@ -82,6 +82,7 @@
 Atsushi Kajita
 Mohamed Kamoun
 Lute Kamstra
+Thomas Kasper
 Joel Keay
 Mumit Khan
 Paul Kienzle
--- a/src/ChangeLog	Wed Dec 19 06:05:58 2007 +0000
+++ b/src/ChangeLog	Wed Dec 19 16:57:21 2007 +0000
@@ -1,3 +1,8 @@
+2007-12-19  Thomas Kasper  <ThomasKasper@gmx.net>
+
+	* OPERATORS/op-scm-cs.cc (DEFBINOP (pow)): Extract complex value
+	from second arg.
+
 2007-12-12  David Bateman  <dbateman@free.fr>
 
 	* DLD-FUNCTIONS/sparse.cc (Fsparse): Check for scalar arguments
--- a/src/OPERATORS/op-scm-cs.cc	Wed Dec 19 06:05:58 2007 +0000
+++ b/src/OPERATORS/op-scm-cs.cc	Wed Dec 19 16:57:21 2007 +0000
@@ -68,7 +68,7 @@
 {
   CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, 
 		   const octave_complex&);
-  return xpow (v1.complex_matrix_value (), v2.scalar_value ());
+  return xpow (v1.complex_matrix_value (), v2.complex_value ());
 }
 
 DEFBINOP (ldiv, sparse_complex_matrix, complex)