Move ScopeGuard into libdcp.

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

diff --git a/src/lib/render_text.h b/src/lib/render_text.h
index 762d794466e9747984dbf3be5d6e11ea153c9b15..ff34dc10d8c1cc4b6c687dd086c9e0443535bd32 100644 (file)
--- a/src/lib/render_text.h
+++ b/src/lib/render_text.h
@@ -19,8 +19,9 @@
 */
 
 
-#include "position_image.h"
 #include "dcpomatic_time.h"
+#include "position_image.h"
+#include "rect.h"
 #include "string_text.h"
 #include <dcp/util.h>
 #include <memory>
@@ -31,8 +32,9 @@ namespace dcpomatic {
 }
 
 
-std::string marked_up (std::list<StringText> subtitles, int target_height, float fade_factor, std::string font_name);
-std::list<PositionImage> render_text (std::list<StringText>, dcp::Size, dcpomatic::DCPTime, int);
+std::string marked_up(std::vector<StringText> subtitles, int target_height, float fade_factor, std::string font_name);
+std::vector<PositionImage> render_text(std::vector<StringText>, dcp::Size, dcpomatic::DCPTime, int);
+std::vector<dcpomatic::Rect<int>> bounding_box(std::vector<StringText> subtitles, dcp::Size target, boost::optional<dcp::SubtitleStandard> override_standard = boost::none);
 
 
 class FontMetrics