From 491ac453512ac1982f62fc0d2a310586427601d7 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 28 Jan 2015 10:35:33 +0000
Subject: Some OS X build fixes.

---
 src/certificate_chain.cc  | 1 -
 src/certificates.cc       | 1 -
 src/mono_picture_frame.cc | 2 +-
 src/mono_picture_frame.h  | 2 +-
 src/mono_picture_mxf.cc   | 1 -
 src/signer.cc             | 1 -
 6 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/certificate_chain.cc b/src/certificate_chain.cc
index 43bdba40..4f92d8d9 100644
--- a/src/certificate_chain.cc
+++ b/src/certificate_chain.cc
@@ -37,7 +37,6 @@ using std::string;
 using std::ofstream;
 using std::ifstream;
 using std::stringstream;
-using std::cout;
 
 /** Run a shell command.
  *  @param cmd Command to run (UTF8-encoded).
diff --git a/src/certificates.cc b/src/certificates.cc
index da8f39c7..a9d0b371 100644
--- a/src/certificates.cc
+++ b/src/certificates.cc
@@ -38,7 +38,6 @@
 
 using std::list;
 using std::string;
-using std::cout;
 using std::ostream;
 using namespace dcp;
 
diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index 617d4687..9c0c3cae 100644
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -120,7 +120,7 @@ MonoPictureFrame::j2k_size () const
  *  is blue, second green, third red and fourth alpha (always 255).
  */
 shared_ptr<ARGBFrame>
-MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const
+MonoPictureFrame::argb_frame (int reduce) const
 {
 	return xyz_to_rgba (
 		decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce),
diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index bcd7024b..aaafe398 100644
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -51,7 +51,7 @@ public:
 	MonoPictureFrame ();
 	~MonoPictureFrame ();
 
-	boost::shared_ptr<ARGBFrame> argb_frame (int reduce = 0, float srgb_gamma = 2.4) const;
+	boost::shared_ptr<ARGBFrame> argb_frame (int reduce = 0) const;
 	void rgb_frame (uint16_t* buffer, boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()) const;
 	uint8_t const * j2k_data () const;
 	uint8_t* j2k_data ();
diff --git a/src/mono_picture_mxf.cc b/src/mono_picture_mxf.cc
index 4114f5ad..09311a01 100644
--- a/src/mono_picture_mxf.cc
+++ b/src/mono_picture_mxf.cc
@@ -28,7 +28,6 @@
 
 using std::string;
 using std::vector;
-using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using namespace dcp;
diff --git a/src/signer.cc b/src/signer.cc
index 67c8ac58..f6cc76ac 100644
--- a/src/signer.cc
+++ b/src/signer.cc
@@ -36,7 +36,6 @@
 
 using std::string;
 using std::list;
-using std::cout;
 using boost::shared_ptr;
 using namespace dcp;
 
-- 
cgit v1.2.3