Account for split branch in libdcp.

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

diff --git a/src/lib/render_text.h b/src/lib/render_text.h
index ff34dc10d8c1cc4b6c687dd086c9e0443535bd32..18264e0d02bd25836389cff46ac03be79c895268 100644 (file)
--- a/src/lib/render_text.h
+++ b/src/lib/render_text.h
@@ -34,7 +34,7 @@ namespace dcpomatic {
 
 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);
+std::vector<dcpomatic::Rect<int>> bounding_box(std::vector<StringText> subtitles, dcp::Size target, boost::optional<dcp::TextStandard> override_standard = boost::none);
 
 
 class FontMetrics