Mercurial > hg > svcore

diff data/fileio/MP3FileReader.cpp @ 980:6e6da0636e5e tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Tue, 09 Sep 2014 16:36:21 +0100
parents 048173126e71
children cc27f35aa75c
line wrap: on
line diff
--- a/data/fileio/MP3FileReader.cpp	Tue Sep 02 16:23:48 2014 +0100
+++ b/data/fileio/MP3FileReader.cpp	Tue Sep 09 16:36:21 2014 +0100
@@ -63,6 +63,10 @@
 
     m_fileSize = stat.st_size;
 
+    m_filebuffer = 0;
+    m_samplebuffer = 0;
+    m_samplebuffersize = 0;
+
     int fd = -1;
     if ((fd = ::open(m_path.toLocal8Bit().data(), O_RDONLY
 #ifdef _WIN32
@@ -73,10 +77,6 @@
 	return;
     }	
 
-    m_filebuffer = 0;
-    m_samplebuffer = 0;
-    m_samplebuffersize = 0;
-
     try {
         m_filebuffer = new unsigned char[m_fileSize];
     } catch (...) {