Some OS X build fixes.

10 files changed, 6 insertions, 12 deletions

diff --git a/asdcplib/src/h__Writer.cpp b/asdcplib/src/h__Writer.cpp
index d743e300..676267ce 100755
--- a/asdcplib/src/h__Writer.cpp
+++ b/asdcplib/src/h__Writer.cpp
@@ -32,7 +32,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "AS_DCP_internal.h"
 #include "KLV.h"
 
-using std::cout;
 using namespace ASDCP;
 using namespace ASDCP::MXF;
 
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;
 
diff --git a/test/certificates_test.cc b/test/certificates_test.cc
index c9839d9c..520cb99c 100644
--- a/test/certificates_test.cc
+++ b/test/certificates_test.cc
@@ -23,7 +23,6 @@
 #include "util.h"
 
 using std::list;
-using std::cout;
 using std::string;
 using boost::shared_ptr;
 
diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 4640b36c..7193a5ef 100644
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -31,10 +31,10 @@ static void
 check_gamma (shared_ptr<const TransferFunction> tf, int bit_depth, float gamma)
 {
 	double const * lut = tf->lut (bit_depth);
-	int const count = pow (2, bit_depth);
+	int const count = rint (pow (2.0, bit_depth));
 
 	for (int i = 0; i < count; ++i) {
-		BOOST_CHECK_CLOSE (lut[i], pow (double(i) / (count - 1), gamma), 0.001);
+		BOOST_CHECK_CLOSE (lut[i], pow (float(i) / (count - 1), gamma), 0.001);
 	}
 }
 
@@ -42,7 +42,7 @@ static void
 check_modified_gamma (shared_ptr<const TransferFunction> tf, int bit_depth, double power, double threshold, double A, double B)
 {
 	double const * lut = tf->lut (bit_depth);
-	int const count = pow (2, bit_depth);
+	int const count = rint (pow (2.0, bit_depth));
 
 	for (int i = 0; i < count; ++i) {
 		double const x = double(i) / (count - 1);
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index c41eaf01..5bedf5f6 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 }
 
 static void
-note (dcp::NoteType, string s)
+note (dcp::NoteType, string)
 {
 
 }