From 003de48cd0371a60d095dc9d02ed5763c410cf5e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 29 May 2013 12:00:36 +0100
Subject: Build fixes for OS X.

---
 src/lib/image.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/image.cc b/src/lib/image.cc
index b166dfac6..bd527e91e 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -68,7 +68,7 @@ Image::lines (int n) const
 		throw PixelFormatError (N_("lines()"), _pixel_format);
 	}
 	
-	return size().height / pow(2, d->log2_chroma_h);
+	return size().height / pow(2.0f, d->log2_chroma_h);
 }
 
 /** @return Number of components */
@@ -417,13 +417,13 @@ Image::bytes_per_pixel (int c) const
 
 	bpp[0] = floor ((d->comp[0].depth_minus1 + 1 + 7) / 8);
 	if (d->nb_components > 1) {
-		bpp[1] = floor ((d->comp[1].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+		bpp[1] = floor ((d->comp[1].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
 	}
 	if (d->nb_components > 2) {
-		bpp[2] = floor ((d->comp[2].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+		bpp[2] = floor ((d->comp[2].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
 	}
 	if (d->nb_components > 3) {
-		bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+		bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
 	}
 	
 	if ((d->flags & PIX_FMT_PLANAR) == 0) {
-- 
cgit v1.2.3


From b1da49fd4f3bc918de2ee4cdf49959258576977c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 29 May 2013 16:06:58 +0100
Subject: Remove unnecessary include; add makedcp-osx.

---
 run/makedcp-osx           | 15 +++++++++++++++
 src/lib/ffmpeg_decoder.cc |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100755 run/makedcp-osx

(limited to 'src/lib')

diff --git a/run/makedcp-osx b/run/makedcp-osx
new file mode 100755
index 000000000..1b95ecc5d
--- /dev/null
+++ b/run/makedcp-osx
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/10.8/lib
+if [ "$1" == "--debug" ]; then
+    shift
+    gdb --args build/src/tools/makedcp "$@"
+elif [ "$1" == "--memcheck" ]; then
+    shift
+    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes build/src/tools/makedcp "$@"
+elif [ "$1" == "--massif" ]; then
+    shift
+    valgrind --tool="massif" build/src/tools/makedcp "$@"
+else
+    build/src/tools/makedcp "$@"
+fi
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 982139515..bcfbea431 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -29,7 +29,6 @@
 #include <stdint.h>
 #include <boost/lexical_cast.hpp>
 extern "C" {
-#include <tiffio.h>
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
-- 
cgit v1.2.3