projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9726a58
)
Add some logging to the system font finder.
author
Carl Hetherington
<cth@carlh.net>
Wed, 6 Jul 2022 22:09:09 +0000
(
00:09
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 20 Jul 2022 08:22:55 +0000
(10:22 +0200)
src/lib/font_config.cc
patch
|
blob
|
history
diff --git
a/src/lib/font_config.cc
b/src/lib/font_config.cc
index 5c9eebb3fb752f7d2cc4fbc104235d9f71d6bbc7..40b9770c76062069af9ece55c5bd7fe30b7a6d3c 100644
(file)
--- a/
src/lib/font_config.cc
+++ b/
src/lib/font_config.cc
@@
-20,6
+20,7
@@
#include "dcpomatic_assert.h"
#include "dcpomatic_assert.h"
+#include "dcpomatic_log.h"
#include "font_config.h"
#include <fontconfig/fontconfig.h>
#include <boost/filesystem.hpp>
#include "font_config.h"
#include <fontconfig/fontconfig.h>
#include <boost/filesystem.hpp>
@@
-91,24
+92,35
@@
FontConfig::system_font_with_name(string name)
{
optional<boost::filesystem::path> path;
{
optional<boost::filesystem::path> path;
+ LOG_GENERAL("Searching system for font %1", name);
auto pattern = FcNameParse(reinterpret_cast<FcChar8 const*>(name.c_str()));
auto object_set = FcObjectSetBuild(FC_FILE, nullptr);
auto font_set = FcFontList(_config, pattern, object_set);
if (font_set) {
auto pattern = FcNameParse(reinterpret_cast<FcChar8 const*>(name.c_str()));
auto object_set = FcObjectSetBuild(FC_FILE, nullptr);
auto font_set = FcFontList(_config, pattern, object_set);
if (font_set) {
+ LOG_GENERAL("%1 candidate fonts found", font_set->nfont);
for (int i = 0; i < font_set->nfont; ++i) {
auto font = font_set->fonts[i];
FcChar8* file;
if (FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {
path = boost::filesystem::path(reinterpret_cast<char*>(file));
for (int i = 0; i < font_set->nfont; ++i) {
auto font = font_set->fonts[i];
FcChar8* file;
if (FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {
path = boost::filesystem::path(reinterpret_cast<char*>(file));
+ LOG_GENERAL("Found %1", *path);
break;
}
}
FcFontSetDestroy(font_set);
break;
}
}
FcFontSetDestroy(font_set);
+ } else {
+ LOG_GENERAL_NC("No candidate fonts found");
}
FcObjectSetDestroy(object_set);
FcPatternDestroy(pattern);
}
FcObjectSetDestroy(object_set);
FcPatternDestroy(pattern);
+ if (path) {
+ LOG_GENERAL("Searched system for font %1, found %2", name, *path);
+ } else {
+ LOG_GENERAL("Searched system for font %1; nothing found", name);
+ }
+
return path;
}
return path;
}