summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-02-01 22:02:14 +0000
committerCarl Hetherington <cth@carlh.net>2019-02-01 22:02:14 +0000
commit38a1363ec4adfd0c8de48ec44ae21a5184ca8317 (patch)
tree4d57260c997654f7a615a5ddd6e36c8191b91f7b /src
parent0789d5215c0398fdc8d94ce6724fab88a3c9c137 (diff)
Try doing it after Pango::init().
Diffstat (limited to 'src')
-rw-r--r--src/lib/util.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 4574757e0..fe8b193d6 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -364,7 +364,12 @@ dcpomatic_setup ()
#ifdef DCPOMATIC_WINDOWS
putenv ("PANGOCAIRO_BACKEND=fontconfig");
putenv (String::compose("FONTCONFIG_PATH=%1", shared_path().string()).c_str());
+#endif
+
+ Pango::init ();
+ dcp::init ();
+#ifdef DCPOMATIC_WINDOWS
/* Render something to fontconfig to create its cache */
list<StringText> subs;
dcp::SubtitleString ss(
@@ -375,9 +380,6 @@ dcpomatic_setup ()
render_text (subs, list<shared_ptr<Font> >(), dcp::Size(640, 480), DCPTime(), 24);
#endif
- Pango::init ();
- dcp::init ();
-
Ratio::setup_ratios ();
PresetColourConversion::setup_colour_conversion_presets ();
VideoContentScale::setup_scales ();