Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

6 files changed, 53 insertions, 5 deletions

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index e0be15794..b9cd1caf5 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -43,7 +43,7 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 	: _film (film)
 	, _image_content (content)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK
+#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE
 	using namespace MagickCore;
 #endif
 	boost::filesystem::path path = content->path(0).string ();
diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index cb168ce63..98054b8df 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -108,9 +108,10 @@ MagickImageProxy::image (optional<dcp::NoteHandler>) const
 	/* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
 	uint8_t* p = _image->data()[0];
 	for (int i = 0; i < size.height; ++i) {
-#ifdef DCPOMATIC_IMAGE_MAGICK
+#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE
 		using namespace MagickCore;
-#else
+#endif
+#ifdef DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE
 		using namespace MagickLib;
 #endif
 		magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
diff --git a/src/lib/raw_convert.cc b/src/lib/raw_convert.cc
new file mode 100644
index 000000000..4325f526f
--- /dev/null
+++ b/src/lib/raw_convert.cc
@@ -0,0 +1,36 @@
+/*
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "raw_convert.h"
+
+using std::string;
+
+template <>
+string
+raw_convert<string, string> (string v, int)
+{
+	return v;
+}
+
+template <>
+string
+raw_convert<string, char const *> (char const * v, int)
+{
+	return v;
+}
diff --git a/src/lib/raw_convert.h b/src/lib/raw_convert.h
index 6e55d49cf..985c4e643 100644
--- a/src/lib/raw_convert.h
+++ b/src/lib/raw_convert.h
@@ -44,4 +44,12 @@ raw_convert (Q v, int precision = 16)
 	return r;
 }
 
+template <>
+std::string
+raw_convert<std::string, char const *> (char const * v, int);
+
+template <>
+std::string
+raw_convert<std::string, std::string> (std::string v, int);
+
 #endif
diff --git a/src/lib/signal_manager.h b/src/lib/signal_manager.h
index 62afacade..8bee68c3c 100644
--- a/src/lib/signal_manager.h
+++ b/src/lib/signal_manager.h
@@ -38,6 +38,8 @@ public:
 		_ui_thread = boost::this_thread::get_id ();
 	}
 
+	virtual ~SignalManager () {}
+
 	/* Do something next time the UI is idle */
 	template <typename T>
 	void when_idle (T f) {
diff --git a/src/lib/wscript b/src/lib/wscript
index fe4eac114..6a9f5106c 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -115,11 +115,12 @@ sources = """
           send_problem_report_job.cc
           server.cc
           string_log_entry.cc
+          raw_convert.cc
+          subtitle_content.cc
+          subtitle_decoder.cc
           text_subtitle.cc
           text_subtitle_content.cc
           text_subtitle_decoder.cc
-          subtitle_content.cc
-          subtitle_decoder.cc
           timer.cc
           transcode_job.cc
           transcoder.cc