# HG changeset patch # User Benjamin Lindner # Date 1238948977 -7200 # Node ID 21f8e9c91b778410354abeb5b69b133f1a3ff4e6 # Parent f835cb5b2484b6ba2be2a7e5529b8513ebb81828 fix broken ascii loading diff -r f835cb5b2484 -r 21f8e9c91b77 src/ChangeLog --- a/src/ChangeLog Wed Apr 01 10:51:28 2009 +0200 +++ b/src/ChangeLog Sun Apr 05 18:29:37 2009 +0200 @@ -2,6 +2,12 @@ Version 3.0.4 released. +2009-04-05 Benjamin Lindner + + * ls-mat-ascii.cc (get_mat_data_input_line): fix eating a whole + line when only newline should be read. fixes broken ascii matrix + loading + 2009-03-18 Benjamin Lindner * ls-oct-ascii.cc (extract_keyword): fix leaving stray '\r' in stream diff -r f835cb5b2484 -r 21f8e9c91b77 src/ls-mat-ascii.cc --- a/src/ls-mat-ascii.cc Wed Apr 01 10:51:28 2009 +0200 +++ b/src/ls-mat-ascii.cc Sun Apr 05 18:29:37 2009 +0200 @@ -84,7 +84,8 @@ if (c == '\n' || c == '\r') { // Let skip_until_newline handle CR/LF issues... - skip_until_newline (is, false); + is.putback (c); + skip_preceeding_newline (is); break; }