Mercurial > octave-nkf
changeset 11947:21f8e9c91b77 release-3-0-x
fix broken ascii loading
author | Benjamin Lindner <lindnerb@users.sourceforge.net> |
---|---|
date | Sun, 05 Apr 2009 18:29:37 +0200 |
parents | f835cb5b2484 |
children | 0c48f7d0f3f2 |
files | src/ChangeLog src/ls-mat-ascii.cc |
diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 <lindnerb@users.sourceforge.net> + + * 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 <lindnerb@users.sourceforge.net> * ls-oct-ascii.cc (extract_keyword): fix leaving stray '\r' in stream
--- 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; }