# HG changeset patch # User jwe # Date 1074867757 0 # Node ID 8f892ca5851d01ef925e625ec6b96b337e323efa # Parent e4bb408219343f557da6a063b5acce27f76f9422 [project @ 2004-01-23 14:22:37 by jwe] diff -r e4bb40821934 -r 8f892ca5851d src/ChangeLog --- a/src/ChangeLog Fri Feb 01 20:51:55 2008 -0500 +++ b/src/ChangeLog Fri Jan 23 14:22:37 2004 +0000 @@ -1,3 +1,8 @@ +2004-01-23 John W. Eaton + + * ov-cell.cc (all_strings): Always compute total required length + of retval. + 2004-01-22 John W. Eaton * error.cc (pr_where): New arg, print_code with default value true. diff -r e4bb40821934 -r 8f892ca5851d src/ov-cell.cc --- a/src/ov-cell.cc Fri Feb 01 20:51:55 2008 -0500 +++ b/src/ov-cell.cc Fri Jan 23 14:22:37 2004 +0000 @@ -280,24 +280,21 @@ int max_len = 0; - if (pad) + for (int j = 0; j < nc; j++) { - for (int j = 0; j < nc; j++) + for (int i = 0; i < nr; i++) { - for (int i = 0; i < nr; i++) - { - string_vector s = matrix(i,j).all_strings (); + string_vector s = matrix(i,j).all_strings (); - if (error_state) - return retval; + if (error_state) + return retval; - n_elts += s.length (); + n_elts += s.length (); - int s_max_len = s.max_length (); + int s_max_len = s.max_length (); - if (s_max_len > max_len) - max_len = s_max_len; - } + if (s_max_len > max_len) + max_len = s_max_len; } } @@ -326,8 +323,6 @@ } } - - return retval; }