projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix conversion of _X to underlined X with GTK (via gtk_label_set_text_with_mnemonic...
[dcpomatic.git]
/
src
/
lib
/
font_config.cc
diff --git
a/src/lib/font_config.cc
b/src/lib/font_config.cc
index 8804bd6d96522b8aa2baf0a8b9e341405393766e..653c9ba84683fec52e4fb39f29e6ca04e104a284 100644
(file)
--- a/
src/lib/font_config.cc
+++ b/
src/lib/font_config.cc
@@
-24,6
+24,7
@@
#include "font.h"
#include "font_config.h"
#include "util.h"
#include "font.h"
#include "font_config.h"
#include "util.h"
+#include <dcp/filesystem.h>
#include <fontconfig/fontconfig.h>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
#include <fontconfig/fontconfig.h>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
@@
-48,7
+49,7
@@
FontConfig::~FontConfig()
{
for (auto file: _temp_files) {
boost::system::error_code ec;
{
for (auto file: _temp_files) {
boost::system::error_code ec;
-
boost
::filesystem::remove(file, ec);
+
dcp
::filesystem::remove(file, ec);
}
}
}
}
@@
-56,6
+57,8
@@
FontConfig::~FontConfig()
string
FontConfig::make_font_available(shared_ptr<dcpomatic::Font> font)
{
string
FontConfig::make_font_available(shared_ptr<dcpomatic::Font> font)
{
+ DCPOMATIC_ASSERT(font);
+
auto existing = _available_fonts.find(font->content());
if (existing != _available_fonts.end()) {
return existing->second;
auto existing = _available_fonts.find(font->content());
if (existing != _available_fonts.end()) {
return existing->second;