# HG changeset patch
# User dbateman
# Date 1165248510 0
# Node ID c67c11e2282879e32b42cf925094016a3d2097a1
# Parent  4942c93e37e3c950560ec9a0c7d598b87b0f1529
[project @ 2006-12-04 16:08:30 by dbateman]

diff -r 4942c93e37e3 -r c67c11e22828 src/ChangeLog
--- a/src/ChangeLog	Mon Dec 04 15:53:59 2006 +0000
+++ b/src/ChangeLog	Mon Dec 04 16:08:30 2006 +0000
@@ -1,5 +1,9 @@
 2006-12-04  David Bateman  <dbateman@free.fr>
 
+	* data.cc (Fdata): If ndims is greater than nargout and
+	nargout is greater than 1, then collect size of trailing
+	dimensions into retval(end).
+
 	* load-path.cc (load_path::do_find_fcn): Return empty string if
 	tests fail.
 
diff -r 4942c93e37e3 -r c67c11e22828 src/data.cc
--- a/src/data.cc	Mon Dec 04 15:53:59 2006 +0000
+++ b/src/data.cc	Mon Dec 04 16:08:30 2006 +0000
@@ -1043,6 +1043,16 @@
 	  for (int i = nargout-1; i >= ndims; i--)
 	    retval(i) = 1;
 
+	  if (ndims > nargout)
+	    {
+	      octave_idx_type d = 1;
+
+	      while (ndims >= nargout)
+		d *= dimensions(--ndims);
+	      
+	      retval(ndims) = d;
+	    }
+
 	  while (ndims--)
 	    retval(ndims) = dimensions(ndims);
 	}