Small callgrind-informed optimisation.

[libdcp.git] / test / recovery_test.cc

diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index 754a49e223330073a6c12ff2b76fccf1b5b9379f..8af49b93a249be943d25f023c6aa70f7f2687e67 100644 (file)
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2013 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/>.
 */
 
 #include <boost/test/unit_test.hpp>
@@ -29,7 +29,7 @@ using boost::shared_ptr;
 /** Check that recovery from a partially-written MXF works */
 BOOST_AUTO_TEST_CASE (recovery)
 {
-       Kumu::libdcp_test = true;
+       Kumu::cth_test = true;
 
        string const picture = "test/data/32x32_red_square.j2c";
        int const size = boost::filesystem::file_size (picture);
@@ -44,8 +44,8 @@ BOOST_AUTO_TEST_CASE (recovery)
 #ifdef LIBDCP_POSIX
        /* XXX: fix this posix-only stuff */
        Kumu::ResetTestRNG ();
-#endif 
-       
+#endif
+
        boost::filesystem::remove_all ("build/test/baz");
        boost::filesystem::create_directories ("build/test/baz");
        shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE (recovery)
        boost::filesystem::resize_file ("build/test/baz/video2.mxf", 16384 + 353 * 11);
 
        {
-               FILE* f = fopen ("build/test/baz/video2.mxf", "r+");
+               FILE* f = fopen ("build/test/baz/video2.mxf", "rb+");
                rewind (f);
                char zeros[256];
                memset (zeros, 0, 256);
@@ -72,9 +72,9 @@ BOOST_AUTO_TEST_CASE (recovery)
                fclose (f);
        }
 
-#ifdef LIBDCP_POSIX    
+#ifdef LIBDCP_POSIX
        Kumu::ResetTestRNG ();
-#endif 
+#endif
 
        mp.reset (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
        writer = mp->start_write ("build/test/baz/video2.mxf", dcp::SMPTE, true);
@@ -88,6 +88,6 @@ BOOST_AUTO_TEST_CASE (recovery)
        for (int i = 4; i < 24; ++i) {
                writer->write (data, size);
        }
-       
+
        writer->finalize ();
 }