From: Carl Hetherington <cth@carlh.net>
Date: Fri, 1 Feb 2019 22:02:14 +0000 (+0000)
Subject: Try doing it after Pango::init().
X-Git-Tag: v2.13.112~13
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=38a1363ec4adfd0c8de48ec44ae21a5184ca8317

Try doing it after Pango::init().
---

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 ();