# HG changeset patch # User jwe # Date 1078865418 0 # Node ID bb82599f039faf28a7cf1fc4133638c350d9df24 # Parent a7b1e6122d0c1873f95a65fc1d0dee094f48384e [project @ 2004-03-09 20:50:18 by jwe] diff -r a7b1e6122d0c -r bb82599f039f liboctave/Array.cc --- a/liboctave/Array.cc Tue Mar 09 19:57:29 2004 +0000 +++ b/liboctave/Array.cc Tue Mar 09 20:50:18 2004 +0000 @@ -2002,28 +2002,16 @@ int len = tmp.length (); - if (len == 0) + if ((len != 0 && idx_arg.one_zero_only ()) + || idx_orig_rows == 1 || idx_orig_columns == 1) { - if (idx_orig_rows == 0 || idx_orig_columns == 0) - retval = Array (dim_vector (idx_orig_rows, idx_orig_columns)); - else if (nr == 1) - retval = Array (dim_vector (1, 0)); + if (nr == 1) + retval = Array (tmp, dim_vector (1, len)); else - retval = Array (dim_vector (0, 1)); + retval = Array (tmp, dim_vector (len, 1)); } else - { - if (idx_arg.one_zero_only () - || idx_orig_rows == 1 || idx_orig_columns == 1) - { - if (nr == 1) - retval = Array (tmp, dim_vector (1, len)); - else - retval = Array (tmp, dim_vector (len, 1)); - } - else - retval = Array (tmp, dim_vector (idx_orig_rows, idx_orig_columns)); - } + retval = Array (tmp, dim_vector (idx_orig_rows, idx_orig_columns)); } else {