diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-01-26 23:34:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-01-26 23:34:00 +0000 |
| commit | 942475447fb7036d56d2befdf1ff4a4201f8923f (patch) | |
| tree | a047ec4e312ec974adbee263938d6be6a103d823 | |
| parent | b71585da17d94606c8d013b5654946ddc61cfe1e (diff) | |
Revert accidentally-committed stuff in pot/merge.
| -rw-r--r-- | src/lib/render_text.cc | 16 |
1 files changed, 8 insertions, 8 deletions
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<StringText> subtitles, list<shared_ptr<Font> > 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<StringText> subtitles, list<shared_ptr<Font> > 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<Font> i, fonts) { if (i->id() == subtitles.front().font() && i->file(FontFiles::NORMAL)) { |