# HG changeset patch # User dbateman # Date 1173388379 0 # Node ID e4d3e9bddff3a892165b468b4d244632804625fe # Parent 9bd49ed48ee6538630683ce91c1c44ed9bf4f0d4 [project @ 2007-03-08 21:12:59 by dbateman] diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-03-08 David Bateman + + * data.cc (do_cat): Ignore leading empty matrices. + 2007-03-07 Bob Weigel * urlwrite.cc (urlget): Allow URL redirects. diff --git a/src/data.cc b/src/data.cc --- a/src/data.cc +++ b/src/data.cc @@ -736,7 +736,8 @@ octave_value tmp; - for (int i = 1; i < n_args; i++) + int i; + for (i = 1; i < n_args; i++) { if (! args (i).all_zero_dims ()) { @@ -752,14 +753,14 @@ Array ra_idx (dv.length (), 0); - for (int i = 1; i < n_args; i++) + for (int j = i; j < n_args; j++) { - tmp = do_cat_op (tmp, args (i), ra_idx); + tmp = do_cat_op (tmp, args (j), ra_idx); if (error_state) return retval; - dim_vector dv_tmp = args (i).dims (); + dim_vector dv_tmp = args (j).dims (); ra_idx (dim) += (dim < dv_tmp.length () ? dv_tmp (dim) : 1); }