Mercurial > octave

changeset 22978:03819d65cc1d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use correct dimensions for liboctave += and -= matrix operators * CMatrix.cc (ComplexMatrix::operator +=, ComplexMatrix::operator -=): Use correct dimensions for argument. * fCMatrix.cc (ComplexMatrix::operator +=, ComplexMatrix::operator -=): Likewise.
author John W. Eaton <jwe@octave.org>
date Thu, 29 Dec 2016 13:36:34 -0500
parents 3793da0dbe37
children 28cd5a239fda aca714a80cfc
files liboctave/array/CMatrix.cc liboctave/array/fCMatrix.cc
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/CMatrix.cc	Wed Dec 28 17:46:01 2016 -0500
+++ b/liboctave/array/CMatrix.cc	Thu Dec 29 13:36:34 2016 -0500
@@ -2716,8 +2716,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
@@ -2734,8 +2734,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
@@ -2752,8 +2752,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
@@ -2770,8 +2770,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
--- a/liboctave/array/fCMatrix.cc	Wed Dec 28 17:46:01 2016 -0500
+++ b/liboctave/array/fCMatrix.cc	Thu Dec 29 13:36:34 2016 -0500
@@ -2736,8 +2736,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
@@ -2754,8 +2754,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
@@ -2772,8 +2772,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
@@ -2790,8 +2790,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);