X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=0b6f4be72b63c7ce1edbbc30fc06f5f33b19b5c0;hb=8f7fdb9fdcd4ffd076f07de9f49801fe01991776;hp=0ad575b5599672d05e4b1c6b58746db9cf1bfb95;hpb=0cbdfdd6c0ef9a1b72070ee741be76332491392a;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 0ad575b55..0b6f4be72 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -38,6 +38,9 @@
 #include "crypto.h"
 #include "compose.hpp"
 #include "audio_buffers.h"
+#include "string_text.h"
+#include "font.h"
+#include "render_text.h"
 #include <dcp/locale_convert.h>
 #include <dcp/util.h>
 #include <dcp/raw_convert.h>
@@ -363,9 +366,25 @@ dcpomatic_setup ()
 	putenv (String::compose("FONTCONFIG_PATH=%1", shared_path().string()).c_str());
 #endif
 
+#ifdef DCPOMATIC_OSX
+	setenv ("PANGOCAIRO_BACKEND", "fontconfig", 1);
+	setenv ("FONTCONFIG_PATH", shared_path().string().c_str(), 1);
+#endif
+
 	Pango::init ();
 	dcp::init ();
 
+#ifdef DCPOMATIC_WINDOWS
+	/* Render something to fontconfig to create its cache */
+	list<StringText> subs;
+	dcp::SubtitleString ss(
+		optional<string>(), false, false, false, dcp::Colour(), 42, 1, dcp::Time(), dcp::Time(), 0, dcp::HALIGN_CENTER, 0, dcp::VALIGN_CENTER, dcp::DIRECTION_LTR,
+		"Hello dolly", dcp::NONE, dcp::Colour(), dcp::Time(), dcp::Time()
+		);
+	subs.push_back (StringText(ss, 0));
+	render_text (subs, list<shared_ptr<Font> >(), dcp::Size(640, 480), DCPTime(), 24);
+#endif
+
 	Ratio::setup_ratios ();
 	PresetColourConversion::setup_colour_conversion_presets ();
 	VideoContentScale::setup_scales ();
@@ -707,7 +726,7 @@ relaxed_string_to_float (string s)
 	try {
 		boost::algorithm::replace_all (s, ",", ".");
 		return lexical_cast<float> (s);
-	} catch (bad_lexical_cast) {
+	} catch (bad_lexical_cast &) {
 		boost::algorithm::replace_all (s, ".", ",");
 		return lexical_cast<float> (s);
 	}