Mercurial > octave-nkf

changeset 10610:f5f6bde82e19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix null assignment bug #29785
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 06 May 2010 14:47:27 +0200
parents 58bcda68ac11
children 31717cc7eeb3
files liboctave/Array.cc liboctave/ChangeLog
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array.cc	Thu May 06 08:02:07 2010 -0400
+++ b/liboctave/Array.cc	Thu May 06 14:47:27 2010 +0200
@@ -1419,7 +1419,7 @@
 
       octave_idx_type l, u;
       bool col_vec = ndims () == 2 && columns () == 1 && rows () != 1;
-      if (i.is_scalar () && i(0) == n-1)
+      if (i.is_scalar () && i(0) == n-1 && dimensions.is_vector ())
         {
           // Stack "pop" operation.
           resize1 (n-1);
--- a/liboctave/ChangeLog	Thu May 06 08:02:07 2010 -0400
+++ b/liboctave/ChangeLog	Thu May 06 14:47:27 2010 +0200
@@ -1,3 +1,8 @@
+2010-05-06  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Array.cc (Array::delete_elements (const idx_vector&)): Only call
+	resize1 when deleting the last element of a vector.
+
 2010-05-06  Jaroslav Hajek  <highegg@gmail.com>
 
 	* oct-norm.h: Fix include guard.