Mercurial > octave-nkf
diff src/ov-intx.h @ 5030:160365410ad4
[project @ 2004-09-24 03:22:23 by jwe]
author | jwe |
---|---|
date | Fri, 24 Sep 2004 03:22:24 +0000 |
parents | 13aaef87cf18 |
children | 23b37da9fd5b |
line wrap: on
line diff
--- a/src/ov-intx.h Thu Sep 23 17:01:13 2004 +0000 +++ b/src/ov-intx.h Fri Sep 24 03:22:24 2004 +0000 @@ -72,7 +72,7 @@ if (Vwarn_fortran_indexing) gripe_implicit_conversion (type_name (), "real scalar"); - retval = double (matrix (0, 0)); + retval = double (matrix(0)); } else gripe_invalid_conversion (type_name (), "real scalar"); @@ -99,7 +99,7 @@ ComplexNDArray retval (matrix.dims ()); int nel = matrix.numel (); for (int i = 0; i < nel; i++) - retval(i) = Complex (matrix(i)); + retval(i) = Complex (double (matrix(i))); return retval; } @@ -197,7 +197,7 @@ complex_array_value (bool = false) const { ComplexNDArray retval (dim_vector (1,1)); - retval(0) = Complex (scalar); + retval(0) = Complex (double (scalar)); return retval; }