Mercurial > octave-nkf
diff libinterp/corefcn/data.cc @ 18815:888f8ce79bbe
maint: Periodic merge gui-release -> default.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 25 May 2014 10:29:05 -0700 |
parents | 5baada25d5a2 bd1fd4ed3d67 |
children | 03c2671493f9 |
line wrap: on
line diff
--- a/libinterp/corefcn/data.cc Wed May 21 23:27:44 2014 +0200 +++ b/libinterp/corefcn/data.cc Sun May 25 10:29:05 2014 -0700 @@ -3291,17 +3291,16 @@ result = Complex (0, 1) * SparseComplexMatrix (im_val); else { - result = SparseComplexMatrix (im_val.dims (), re_val (0)); octave_idx_type nr = im_val.rows (); octave_idx_type nc = im_val.cols (); + result = SparseComplexMatrix (nr, nc, re_val(0)); for (octave_idx_type j = 0; j < nc; j++) { octave_idx_type off = j * nr; for (octave_idx_type i = im_val.cidx (j); i < im_val.cidx (j + 1); i++) - result.data (im_val.ridx (i) + off) = - result.data (im_val.ridx (i) + off) + + result.data (im_val.ridx (i) + off) += Complex (0, im_val.data (i)); } } @@ -3314,19 +3313,17 @@ result = SparseComplexMatrix (re_val); else { - result = SparseComplexMatrix (re_val.rows (), - re_val.cols (), - Complex (0, im_val (0))); octave_idx_type nr = re_val.rows (); octave_idx_type nc = re_val.cols (); + result = SparseComplexMatrix (nr, nc, + Complex (0, im_val(0))); for (octave_idx_type j = 0; j < nc; j++) { octave_idx_type off = j * nr; for (octave_idx_type i = re_val.cidx (j); i < re_val.cidx (j + 1); i++) - result.data (re_val.ridx (i) + off) = - result.data (re_val.ridx (i) + off) + + result.data (re_val.ridx (i) + off) += re_val.data (i); } }