From: Carl Hetherington <cth@carlh.net>
Date: Thu, 16 Oct 2014 15:30:11 +0000 (+0100)
Subject: Merge branch 'master' into 12bit
X-Git-Tag: v2.0.48~551^2~17
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6;hp=-c

Merge branch 'master' into 12bit
---

0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6
diff --combined src/lib/dcp_video_frame.cc
index c8f8c3cc5,bb7eaa064..057ed0fae
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@@ -34,7 -34,6 +34,6 @@@
  #include <stdexcept>
  #include <cstdio>
  #include <iomanip>
- #include <sstream>
  #include <iostream>
  #include <fstream>
  #include <unistd.h>
@@@ -67,7 -66,6 +66,6 @@@
  #include "i18n.h"
  
  using std::string;
- using std::stringstream;
  using std::cout;
  using boost::shared_ptr;
  using libdcp::Size;
@@@ -127,7 -125,7 +125,7 @@@ DCPVideoFrame::encode_locally (
  	}
  
  	shared_ptr<libdcp::XYZFrame> xyz = libdcp::rgb_to_xyz (
 -		_frame->image(),
 +		_frame->image(AV_PIX_FMT_RGB48BE),
  		in_lut,
  		libdcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma),
  		matrix
@@@ -282,10 -280,9 +280,9 @@@ DCPVideoFrame::encode_remotely (ServerD
  	LOG_GENERAL (N_("Sending frame %1 to remote"), _index);
  	
  	/* Send XML metadata */
- 	stringstream xml;
- 	doc.write_to_stream (xml, "UTF-8");
- 	socket->write (xml.str().length() + 1);
- 	socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1);
+ 	string xml = doc.write_to_string ("UTF-8");
+ 	socket->write (xml.length() + 1);
+ 	socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
  
  	/* Send binary data */
  	_frame->send_binary (socket);
diff --combined src/lib/image.cc
index 1c6c02979,066f12c07..3b8c1a28e
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@@ -38,7 -38,6 +38,6 @@@ using std::string
  using std::min;
  using std::cout;
  using std::cerr;
- using std::stringstream;
  using boost::shared_ptr;
  using libdcp::Size;
  
@@@ -320,8 -319,6 +319,8 @@@ Image::make_black (
  	case PIX_FMT_ABGR:
  	case PIX_FMT_BGRA:
  	case PIX_FMT_RGB555LE:
 +	case PIX_FMT_RGB48LE:
 +	case PIX_FMT_RGB48BE:
  		memset (data()[0], 0, lines(0) * stride()[0]);
  		break;
  
diff --combined src/wx/film_viewer.cc
index 112736b67,595fd4720..54cd3e77d
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@@ -53,7 -53,7 +53,7 @@@ using boost::dynamic_pointer_cast
  using boost::weak_ptr;
  using libdcp::Size;
  
- FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
+ FilmViewer::FilmViewer (wxWindow* p)
  	: wxPanel (p)
  	, _panel (new wxPanel (this))
  	, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
@@@ -103,8 -103,8 +103,8 @@@
  	_back_button->Bind    (wxEVT_COMMAND_BUTTON_CLICKED,       boost::bind (&FilmViewer::back_clicked,    this));
  	_forward_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,       boost::bind (&FilmViewer::forward_clicked, this));
  
- 	set_film (f);
- 
+ 	set_film (shared_ptr<Film> ());
+ 	
  	JobManager::instance()->ActiveJobsChanged.connect (
  		bind (&FilmViewer::active_jobs_changed, this, _1)
  		);
@@@ -295,7 -295,7 +295,7 @@@ FilmViewer::process_video (shared_ptr<P
  		return;
  	}
  	
 -	_frame = pvf->image ();
 +	_frame = pvf->image (PIX_FMT_RGB24);
  	_got_frame = true;
  
  	set_position_text (t);