BOOST_FOREACH.

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

diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc
index b3ddad5bb26b75c73658f4da3f90925813adc73f..3dc1e9ff0e4efcd0839281439c86be8b01364977 100644 (file)
--- a/src/lib/render_text.cc
+++ b/src/lib/render_text.cc
@@ -36,7 +36,6 @@ DCPOMATIC_ENABLE_WARNINGS
 #ifndef DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT
 #include <pango/pangocairo.h>
 #endif
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 
@@ -48,7 +47,7 @@ using std::max;
 using std::pair;
 using std::cerr;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::algorithm::replace_all;
 using namespace dcpomatic;
@@ -61,7 +60,7 @@ marked_up (list<StringText> subtitles, int target_height, float fade_factor)
 {
        string out;
 
-       BOOST_FOREACH (StringText const & i, subtitles) {
+       for (auto const& i: subtitles) {
                out += "<span ";
                if (i.italic()) {
                        out += "style=\"italic\" ";
@@ -142,7 +141,7 @@ setup_font (StringText const& subtitle, list<shared_ptr<Font> > const& fonts)
 
        optional<boost::filesystem::path> font_file = default_font_file ();
 
-       BOOST_FOREACH (shared_ptr<Font> i, fonts) {
+       for (auto i: fonts) {
                if (i->id() == subtitle.font() && i->file()) {
                        font_file = i->file ();
                }
@@ -289,8 +288,10 @@ static Glib::RefPtr<Pango::Layout>
 create_layout()
 {
        PangoFontMap* c_font_map = pango_cairo_font_map_new ();
+       DCPOMATIC_ASSERT (c_font_map);
        Glib::RefPtr<Pango::FontMap> font_map = Glib::wrap (c_font_map);
        PangoContext* c_context = pango_font_map_create_context (c_font_map);
+       DCPOMATIC_ASSERT (c_context);
        Glib::RefPtr<Pango::Context> context = Glib::wrap (c_context);
        return Pango::Layout::create (context);
 }
@@ -402,7 +403,7 @@ render_text (list<StringText> subtitles, list<shared_ptr<Font> > fonts, dcp::Siz
        list<StringText> pending;
        list<PositionImage> images;
 
-       BOOST_FOREACH (StringText const & i, subtitles) {
+       for (auto const& i: subtitles) {
                if (!pending.empty() && (i.v_align() != pending.back().v_align() || fabs(i.v_position() - pending.back().v_position()) > 1e-4)) {
                        images.push_back (render_line (pending, fonts, target, time, frame_rate));
                        pending.clear ();