diff src/ov-str-mat.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 034800482c79
line wrap: on
line diff
--- a/src/ov-str-mat.cc	Mon Mar 09 17:13:58 2009 -0400
+++ b/src/ov-str-mat.cc	Tue Mar 10 01:01:50 2009 -0400
@@ -36,11 +36,12 @@
 #include "mx-base.h"
 #include "oct-locbuf.h"
 
+#include "byte-swap.h"
 #include "defun.h"
-#include "byte-swap.h"
 #include "gripes.h"
+#include "ls-ascii-helper.h"
+#include "ls-hdf5.h"
 #include "ls-oct-ascii.h"
-#include "ls-hdf5.h"
 #include "ls-utils.h"
 #include "oct-obj.h"
 #include "oct-stream.h"
@@ -316,9 +317,7 @@
 		    {
 		      char *ftmp = tmp.fortran_vec ();
 
-		      // Skip the return line
-		      if (! is.read (ftmp, 1))
-			return false;
+		      skip_preceeding_newline (is);
 
 		      if (! is.read (ftmp, dv.numel ()) || !is)
 			{