From 942475447fb7036d56d2befdf1ff4a4201f8923f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 26 Jan 2019 23:34:00 +0000 Subject: Revert accidentally-committed stuff in pot/merge. --- src/lib/render_text.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc index 267e8619b..7ae7d9152 100644 --- a/src/lib/render_text.cc +++ b/src/lib/render_text.cc @@ -165,8 +165,8 @@ render_line (list subtitles, list > fonts, dcp::Siz try { font_files.set (FontFiles::NORMAL, shared_path () / "LiberationSans-Regular.ttf"); -// font_files.set (FontFiles::ITALIC, shared_path () / "LiberationSans-Italic.ttf"); -// font_files.set (FontFiles::BOLD, shared_path () / "LiberationSans-Bold.ttf"); + font_files.set (FontFiles::ITALIC, shared_path () / "LiberationSans-Italic.ttf"); + font_files.set (FontFiles::BOLD, shared_path () / "LiberationSans-Bold.ttf"); } catch (boost::filesystem::filesystem_error& e) { } @@ -176,12 +176,12 @@ render_line (list subtitles, list > fonts, dcp::Siz if (!font_files.get(FontFiles::NORMAL) || !boost::filesystem::exists(font_files.get(FontFiles::NORMAL).get())) { font_files.set (FontFiles::NORMAL, "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"); } - // if (!font_files.get(FontFiles::ITALIC) || !boost::filesystem::exists(font_files.get(FontFiles::ITALIC).get())) { - // font_files.set (FontFiles::ITALIC, "/usr/share/fonts/truetype/liberation/LiberationSans-Italic.ttf"); - // } - // if (!font_files.get(FontFiles::BOLD) || !boost::filesystem::exists(font_files.get(FontFiles::BOLD).get())) { - // font_files.set (FontFiles::BOLD, "/usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf"); - // } + if (!font_files.get(FontFiles::ITALIC) || !boost::filesystem::exists(font_files.get(FontFiles::ITALIC).get())) { + font_files.set (FontFiles::ITALIC, "/usr/share/fonts/truetype/liberation/LiberationSans-Italic.ttf"); + } + if (!font_files.get(FontFiles::BOLD) || !boost::filesystem::exists(font_files.get(FontFiles::BOLD).get())) { + font_files.set (FontFiles::BOLD, "/usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf"); + } BOOST_FOREACH (shared_ptr i, fonts) { if (i->id() == subtitles.front().font() && i->file(FontFiles::NORMAL)) { -- cgit v1.2.3