Fix build problems with warnings generated by newer macOS build environments.

6 files changed, 22 insertions, 10 deletions

diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc
index 7aecf752f..33182e4a9 100644
--- a/src/lib/dcpomatic_socket.cc
+++ b/src/lib/dcpomatic_socket.cc
@@ -278,18 +278,18 @@ Socket::check_read_digest ()
 	DCPOMATIC_ASSERT (_read_digester);
 	int const size = _read_digester->size ();
 
-	uint8_t ref[size];
-	_read_digester->get (ref);
+	std::vector<uint8_t> ref(size);
+	_read_digester->get(ref.data());
 
 	/* Make sure _read_digester is gone before we call read() so that the digest
 	 * isn't itself digested.
 	 */
 	_read_digester.reset ();
 
-	uint8_t actual[size];
-	read (actual, size);
+	std::vector<uint8_t> actual(size);
+	read(actual.data(), size);
 
-	return memcmp(ref, actual, size) == 0;
+	return ref == actual;
 }
 
 
@@ -299,15 +299,15 @@ Socket::finish_write_digest ()
 	DCPOMATIC_ASSERT (_write_digester);
 	int const size = _write_digester->size();
 
-	uint8_t buffer[size];
-	_write_digester->get (buffer);
+	std::vector<uint8_t> buffer(size);
+	_write_digester->get(buffer.data());
 
 	/* Make sure _write_digester is gone before we call write() so that the digest
 	 * isn't itself digested.
 	 */
 	_write_digester.reset ();
 
-	write (buffer, size);
+	write(buffer.data(), size);
 }
 
 
diff --git a/src/lib/font.h b/src/lib/font.h
index 669504579..55e3f33b7 100644
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -24,9 +24,12 @@
 
 
 #include <dcp/array_data.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
 #include <boost/optional.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <string>
 
diff --git a/src/lib/image.cc b/src/lib/image.cc
index de57ee877..51e894900 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -286,7 +286,7 @@ Image::crop_scale_window(
 		round_height_for_subsampling((out_size.height - inter_size.height) / 2, out_desc)
 		);
 
-	uint8_t* scale_out_data[out->planes()];
+	std::vector<uint8_t*> scale_out_data(out->planes());
 	for (int c = 0; c < out->planes(); ++c) {
 		int const x = lrintf(out->bytes_per_pixel(c) * corner.x);
 		scale_out_data[c] = out->data()[c] + x + out->stride()[c] * (corner.y / out->vertical_factor(c));
@@ -296,7 +296,7 @@ Image::crop_scale_window(
 		scale_context,
 		scale_in_data.data(), stride(),
 		0, cropped_size.height,
-		scale_out_data, out->stride()
+		scale_out_data.data(), out->stride()
 		);
 
 	sws_freeContext(scale_context);
diff --git a/src/lib/job.h b/src/lib/job.h
index d46e5c73a..f435d815a 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -29,8 +29,11 @@
 
 
 #include "signaller.h"
+#include <dcp/warnings.h>
 #include <boost/atomic.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <string>
diff --git a/src/lib/log.h b/src/lib/log.h
index 142e46223..c6685bda1 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -30,9 +30,12 @@
 
 #include "log_entry.h"
 #include <dcp/types.h>
+#include <dcp/warnings.h>
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <string>
 
 
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 0d38cbf67..0ccd8c290 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -28,8 +28,11 @@
 #include "frame_rate_change.h"
 #include "path_behaviour.h"
 #include "types.h"
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <list>