Mercurial > hg > octave-nkf
changeset 10806:7c542263a92a
omissions from last two patches
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Tue, 20 Jul 2010 13:10:40 +0200 |
parents | 8c858a1a2079 |
children | bdde9c59f77a |
files | liboctave/CMatrix.cc liboctave/dMatrix.cc liboctave/fCMatrix.cc liboctave/fMatrix.cc src/DLD-FUNCTIONS/dlmread.cc |
diffstat | 5 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/CMatrix.cc +++ b/liboctave/CMatrix.cc @@ -909,7 +909,7 @@ ComplexMatrix ComplexMatrix::extract_n (octave_idx_type r1, octave_idx_type c1, octave_idx_type nr, octave_idx_type nc) const { - return index (idx_vector (r1, r1 + nr), idx_vector (r2, r2 + nr)); + return index (idx_vector (r1, r1 + nr), idx_vector (c1, c1 + nc)); } // extract row or column i.
--- a/liboctave/dMatrix.cc +++ b/liboctave/dMatrix.cc @@ -586,7 +586,7 @@ Matrix Matrix::extract_n (octave_idx_type r1, octave_idx_type c1, octave_idx_type nr, octave_idx_type nc) const { - return index (idx_vector (r1, r1 + nr), idx_vector (r2, r2 + nr)); + return index (idx_vector (r1, r1 + nr), idx_vector (c1, c1 + nc)); } // extract row or column i.
--- a/liboctave/fCMatrix.cc +++ b/liboctave/fCMatrix.cc @@ -908,7 +908,7 @@ FloatComplexMatrix FloatComplexMatrix::extract_n (octave_idx_type r1, octave_idx_type c1, octave_idx_type nr, octave_idx_type nc) const { - return index (idx_vector (r1, r1 + nr), idx_vector (r2, r2 + nr)); + return index (idx_vector (r1, r1 + nr), idx_vector (c1, c1 + nc)); } // extract row or column i.
--- a/liboctave/fMatrix.cc +++ b/liboctave/fMatrix.cc @@ -585,7 +585,7 @@ FloatMatrix FloatMatrix::extract_n (octave_idx_type r1, octave_idx_type c1, octave_idx_type nr, octave_idx_type nc) const { - return index (idx_vector (r1, r1 + nr), idx_vector (r2, r2 + nr)); + return index (idx_vector (r1, r1 + nr), idx_vector (c1, c1 + nc)); } // extract row or column i.