Mercurial > hg > svcore

changeset 231:0031495aba07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
...
author Chris Cannam
date Mon, 12 Feb 2007 18:15:49 +0000
parents 2854dc429310
children 03a24547cf3c
files data/fileio/MP3FileReader.cpp
diffstat 1 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/MP3FileReader.cpp	Mon Feb 12 13:25:12 2007 +0000
+++ b/data/fileio/MP3FileReader.cpp	Mon Feb 12 18:15:49 2007 +0000
@@ -51,7 +51,11 @@
     m_fileSize = stat.st_size;
 
     int fd = -1;
-    if ((fd = ::open(path.toLocal8Bit().data(), O_RDONLY, 0)) < 0) {
+    if ((fd = ::open(path.toLocal8Bit().data(), O_RDONLY
+#ifdef _WIN32
+                     | O_BINARY
+#endif
+                     , 0)) < 0) {
 	m_error = QString("Failed to open file %1 for reading.").arg(path);
 	return;
     }	
@@ -71,12 +75,15 @@
     while (offset < m_fileSize) {
         sz = ::read(fd, filebuffer + offset, m_fileSize - offset);
         if (sz < 0) {
-            m_error = QString("Read error for file %1 (after %2 bytes)").arg(path).arg(offset);
+            m_error = QString("Read error for file %1 (after %2 bytes)")
+                .arg(path).arg(offset);
             delete[] filebuffer;
             ::close(fd);
             return;
         } else if (sz == 0) {
-            std::cerr << QString("MP3FileReader::MP3FileReader: Warning: read only %1 of %2 bytes").arg(offset).arg(m_fileSize).toStdString() << std::endl;
+            std::cerr << QString("MP3FileReader::MP3FileReader: Warning: reached EOF after only %1 of %2 bytes")
+                .arg(offset).arg(m_fileSize).toStdString() << std::endl;
+            m_fileSize = offset;
             break;
         }
         offset += sz;