Merge master.

diff --cc test/test.cc
index f9d761da305dd150e858a48c794710e4615c49a5,be2cf15389949c9ead1d23f5804b65c1c50ab99e..e43db71ef9c3ded8b833f3e94c289cc7be2b05fc
--- 1/test/test.cc
--- 2/test/test.cc
+++ b/test/test.cc
@@@ -101,10 -98,10 +101,10 @@@ voi
  check_file (boost::filesystem::path ref, boost::filesystem::path check)
  {
        uintmax_t N = boost::filesystem::file_size (ref);
 -      BOOST_CHECK_EQUAL (N, boost::filesystem::file_size(check));
 -      FILE* ref_file = fopen_boost (ref, "rb");
 +      BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
 +      FILE* ref_file = fopen (ref.c_str(), "rb");
        BOOST_CHECK (ref_file);
-       FILE* check_file = fopen (check.c_str(), "rb");
+       FILE* check_file = fopen_boost (check, "rb");
        BOOST_CHECK (check_file);
        
        int const buffer_size = 65536;

diff --cc test/test.h
index b6347a5cad354f338b5c2a23ca67ccd8b46e4340,dd007e8c9a15033e0db8112b4f3856bb5582c3e4..a42b41577917aa946c39f4aa6467a632ea449cba
--- 1/test/test.h
--- 2/test/test.h
+++ b/test/test.h
@@@ -24,8 -23,7 +24,9 @@@ class Image
  
  extern void wait_for_jobs ();
  extern boost::shared_ptr<Film> new_test_film (std::string);
 -extern void check_dcp (std::string, std::string);
 +extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
 +extern void check_file (boost::filesystem::path ref, boost::filesystem::path check);
  extern void check_xml (boost::filesystem::path, boost::filesystem::path, std::list<std::string>);
+ extern void check_file (boost::filesystem::path, boost::filesystem::path);
  extern boost::filesystem::path test_film_dir (std::string);
 +extern void write_image (boost::shared_ptr<const Image> image, boost::filesystem::path file);

diff --cc test/wscript
index de9e9f25a41a8c66f4e22783f59cf3092112a328,c07f2cc335747a8c092c324d691a1fa34b826554..24daa7762001dc3d0ee764d58030cd4f6625a180
--- 1/test/wscript
--- 2/test/wscript
+++ b/test/wscript
@@@ -37,14 -36,11 +37,15 @@@ def build(bld)
                   pixel_formats_test.cc
                   play_test.cc
                   ratio_test.cc
 +                 repeat_frame_test.cc
+                  recover_test.cc
                   resampler_test.cc
                   scaling_test.cc
 +                 seek_zero_test.cc
                   silence_padding_test.cc
 +                 skip_frame_test.cc
                   stream_test.cc
 +                 subrip_test.cc
                   test.cc
                   threed_test.cc
                   util_test.cc

diff --cc wscript
Simple merge