From: Carl Hetherington <cth@carlh.net>
Date: Thu, 23 Jan 2014 00:22:20 +0000 (+0000)
Subject: Merge master.
X-Git-Tag: v2.0.48~920
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=b299c1873bf23414061d551843275c77a9256a05

Merge master.
---

b299c1873bf23414061d551843275c77a9256a05
diff --cc test/test.cc
index f9d761da3,be2cf1538..e43db71ef
--- a/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 b6347a5ca,dd007e8c9..a42b41577
--- a/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 de9e9f25a,c07f2cc33..24daa7762
--- a/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