Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / file.cc

diff --git a/src/file.cc b/src/file.cc
index f4a91add29be8441c5f3e9ab2fc11ac916b9aa2c..6fe4b2992f35ab620812186e2063240ebb4d2b4c 100644 (file)
--- a/src/file.cc
+++ b/src/file.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/file.cc
@@ -23,6 +37,7 @@
 
 #include "file.h"
 #include "util.h"
+#include "dcp_assert.h"
 #include <stdio.h>
 
 using namespace dcp;
@@ -34,8 +49,8 @@ File::File (boost::filesystem::path file)
 {
        _size = boost::filesystem::file_size (file);
        _data = new uint8_t[_size];
-       FILE* f = dcp::fopen_boost (file, "r");
-       assert (f);
+       FILE* f = dcp::fopen_boost (file, "rb");
+       DCP_ASSERT (f);
        fread (_data, 1, _size, f);
        fclose (f);
 }