It doesn't seem necessary to use shared_ptr for the DCPVideo queue in J2KEncoder.

[dcpomatic.git] / src / lib / font_data.h

diff --git a/src/lib/font_data.h b/src/lib/font_data.h
index 90543bec91ff613c45762a992b4b46bc3f8968c6..7bd6d46482a55fe9c137c022b257b843657233f2 100644 (file)
--- a/src/lib/font_data.h
+++ b/src/lib/font_data.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,6 +19,10 @@
 */
 
 
+#ifndef DCPOMATIC_FONT_DATA_H
+#define DCPOMATIC_FONT_DATA_H
+
+
 #include <dcp/array_data.h>
 #include <boost/optional.hpp>
 #include <string>
@@ -34,13 +38,14 @@ class Font;
 class FontData
 {
 public:
-       FontData (boost::shared_ptr<const Font> font);
+       FontData (std::shared_ptr<const Font> font);
 
        FontData (std::string id_, dcp::ArrayData data_)
                : id(id_)
                , data(data_)
        {}
 
+       /** <LoadFont> ID */
        std::string id;
        boost::optional<dcp::ArrayData> data;
 };
@@ -51,3 +56,6 @@ extern bool operator!= (FontData const& a, FontData const& b);
 
 
 }
+
+
+#endif