Mercurial > octave-libgccjit
diff src/ls-mat-ascii.cc @ 8946:e7e928088e90
fix CRLF issues with text-mode reading in windows when loading ascii data
| author | Benjamin Lindner <lindnerb@users.sourceforge.net> |
|---|---|
| date | Tue, 10 Mar 2009 01:01:50 -0400 |
| parents | eb63fbe60fab |
| children | 985792c9e0da |
line wrap: on
line diff
--- a/src/ls-mat-ascii.cc Mon Mar 09 17:13:58 2009 -0400 +++ b/src/ls-mat-ascii.cc Tue Mar 10 01:01:50 2009 -0400 @@ -51,6 +51,8 @@ #include "gripes.h" #include "lex.h" #include "load-save.h" +#include "ls-ascii-helper.h" +#include "ls-mat-ascii.h" #include "oct-obj.h" #include "oct-map.h" #include "ov-cell.h" @@ -63,8 +65,6 @@ #include "version.h" #include "dMatrix.h" -#include "ls-mat-ascii.h" - static std::string get_mat_data_input_line (std::istream& is) { @@ -80,15 +80,14 @@ while (is.get (c)) { if (c == '\n' || c == '\r') - break; + { + skip_until_newline (is, false); + break; + } if (c == '%' || c == '#') { - // skip to end of line - while (is.get (c)) - if (c == '\n' || c == '\r') - break; - + skip_until_newline (is, false); break; }