X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffont.cc;h=375427d93f71d57897da277f392b668dfce4f6d9;hb=111c05bebe5bc2b6f0031f66e429390ffe704556;hp=a2dc1945f009a8facb973bd5eec19d51f256e373;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git

diff --git a/src/lib/font.cc b/src/lib/font.cc
index a2dc1945f..375427d93 100644
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -21,13 +21,14 @@
 
 #include "dcpomatic_assert.h"
 #include "font.h"
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
+using boost::optional;
 using namespace dcpomatic;
 
 
@@ -69,3 +70,19 @@ dcpomatic::operator!= (Font const & a, Font const & b)
 {
 	return !(a == b);
 }
+
+
+optional<dcp::ArrayData>
+Font::data () const
+{
+	if (_data) {
+		return _data;
+	}
+
+	if (_file) {
+		return dcp::ArrayData(*_file);
+	}
+
+	return {};
+}
+