Check that pango/cairo stuff is created successfully.

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

diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc
index f0866267866f68dbe318d02e9d28dca27b9a376c..93043ed066111d2feaf176a2bbbced0ba54b782f 100644 (file)
--- a/src/lib/render_text.cc
+++ b/src/lib/render_text.cc
@@ -25,6 +25,7 @@
 #include "font.h"
 #include "dcpomatic_assert.h"
 #include "warnings.h"
+#include "util.h"
 #include <dcp/raw_convert.h>
 #include <fontconfig/fontconfig.h>
 #include <cairomm/cairomm.h>
@@ -139,19 +140,7 @@ setup_font (StringText const& subtitle, list<shared_ptr<Font> > const& fonts)
                fc_config = FcInitLoadConfig ();
        }
 
-       optional<boost::filesystem::path> font_file;
-
-       try {
-               font_file = resources_path() / "LiberationSans-Regular.ttf";
-       } catch (boost::filesystem::filesystem_error& e) {
-
-       }
-
-       /* Hack: try the debian/ubuntu locations if getting the shared path failed */
-
-       if (!font_file || !boost::filesystem::exists(*font_file)) {
-               font_file = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf";
-       }
+       optional<boost::filesystem::path> font_file = default_font_file ();
 
        BOOST_FOREACH (shared_ptr<Font> i, fonts) {
                if (i->id() == subtitle.font() && i->file()) {
@@ -300,8 +289,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);
 }
@@ -343,7 +334,7 @@ render_line (list<StringText> subtitles, list<shared_ptr<Font> > fonts, dcp::Siz
                }
        }
 
-       float const border_width = dcp::BORDER ? (first.outline_width * target.width / 2048.0) : 0;
+       float const border_width = first.effect() == dcp::BORDER ? (first.outline_width * target.width / 2048.0) : 0;
        size.width += 2 * ceil (border_width);
        size.height += 2 * ceil (border_width);