Mercurial > octave-nkf

changeset 8760:b0356f30a33b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix 2-subs assigment into n-d arrays
author Jaroslav Hajek <highegg@gmail.com>
date Mon, 16 Feb 2009 15:05:24 +0100
parents c32a08dccae6
children 1db8033efa17
files liboctave/Array.cc liboctave/ChangeLog
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array.cc	Mon Feb 16 13:53:11 2009 +0100
+++ b/liboctave/Array.cc	Mon Feb 16 15:05:24 2009 +0100
@@ -1318,7 +1318,7 @@
           else
             {
               // The actual work.
-              octave_idx_type n = numel (), r = rows (), c = columns ();
+              octave_idx_type n = numel (), r = dv (0), c = dv (1);
               idx_vector ii (i);
 
               const T* src = rhs.data ();
--- a/liboctave/ChangeLog	Mon Feb 16 13:53:11 2009 +0100
+++ b/liboctave/ChangeLog	Mon Feb 16 15:05:24 2009 +0100
@@ -1,3 +1,8 @@
+2009-02-16  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Array.cc (Array<T>::assign (const idx_vector& i,
+	const idx_vector& j,...)): Fix invalid dimension inquiry.
+
 2009-02-16  Jaroslav Hajek  <highegg@gmail.com>
 	
 	* mx-inlines.cc (OP_ROW_SHORT_CIRCUIT): New macro.