Merge branch 'master' of /home/carl/git/dvdomatic

7 files changed, 29 insertions, 7 deletions

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>
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) {
diff --git a/src/tools/servomatic_gui.cc b/src/tools/servomatic_gui.cc
index 5e36660eb..000c2019f 100644
--- a/src/tools/servomatic_gui.cc
+++ b/src/tools/servomatic_gui.cc
@@ -102,8 +102,11 @@ public:
 		wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), POSIX_ICON_PREFIX), wxBITMAP_TYPE_PNG);
 		wxIcon icon;
 		icon.CopyFromBitmap (bitmap);
-#endif		
+#endif
+#ifndef __WXOSX__
+		/* XXX: fix this for OS X */
 		SetIcon (icon, std_to_wx ("DVD-o-matic encode server"));
+#endif		
 
 		Connect (ID_status, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::status));
 		Connect (ID_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::quit));
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index cf44eb69f..3fec1d3fe 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -42,7 +42,9 @@ AudioPlot::AudioPlot (wxWindow* parent)
 	, _gain (0)
 	, _smoothing (max_smoothing / 2)
 {
+#ifndef __WXOSX__	
 	SetDoubleBuffered (true);
+#endif	
 
 	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
 		_channel_visible[i] = false;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 4f2985a06..82490e329 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -59,7 +59,10 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
 	, _display_frame_x (0)
 	, _got_frame (false)
 {
+#ifndef __WXOSX__
 	_panel->SetDoubleBuffered (true);
+#endif
+	
 #if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
 	_panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
 #endif	
diff --git a/test/wscript b/test/wscript
index 15d5410b3..5de1a99ce 100644
--- a/test/wscript
+++ b/test/wscript
@@ -3,7 +3,7 @@ def configure(conf):
                               #define BOOST_TEST_MODULE Config test\n
     			      #include <boost/test/unit_test.hpp>\n
                               int main() {}
-                              """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework-mt', uselib_store = 'BOOST_TEST')
+                              """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework', uselib_store = 'BOOST_TEST')
 
 def build(bld):
     obj = bld(features = 'cxx cxxprogram')