# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1251018755 -7200
# Node ID 310063a874079095b0e3ea456863980304f6e59f
# Parent  634697062fe15adbb8659fd850e5ffb7335ebc9f
zero matrix assignment fix

diff -r 634697062fe1 -r 310063a87407 liboctave/Array-util.cc
--- a/liboctave/Array-util.cc	Sun Aug 23 11:12:16 2009 +0200
+++ b/liboctave/Array-util.cc	Sun Aug 23 11:12:35 2009 +0200
@@ -455,6 +455,12 @@
       rdv(0) = rhdv(0);
       rdv(1) = rhdv(1);
     }
+  else if (rhdv.length () == 2
+           && ! i.is_scalar () && ! j.is_scalar ())
+    {
+      rdv(0) = icol ? rhdv(0) : i.extent (0);
+      rdv(1) = jcol ? rhdv(1) : j.extent (0);
+    }
   else
     {
       dim_vector rhdv0 = rhdv;
diff -r 634697062fe1 -r 310063a87407 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Sun Aug 23 11:12:16 2009 +0200
+++ b/liboctave/ChangeLog	Sun Aug 23 11:12:35 2009 +0200
@@ -1,3 +1,7 @@
+2009-08-19  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Array-util.cc (zero_dims_inquire): Add matching ndims case.
+
 2009-08-16  Jaroslav Hajek  <highegg@gmail.com>
 
 	* dMatrix.cc, fMatrix.cc, CMatrix.cc, fCMatrix.cc: Add more tests.