mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Handle i/o errors when indexing fonts for GDI

Browse source
This commit is contained in:
Thomas Goyne 2016-01-09 08:38:41 -08:00
parent 3c381b6c55
commit bb3e0de728
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/font_file_lister_gdi.cpp
View file

@ -16,6 +16,8 @@
#include "font_file_lister.h" #include "font_file_lister.h"
#include "compat.h"
#include <libaegisub/charset_conv_win.h> #include <libaegisub/charset_conv_win.h>
#include <libaegisub/fs.h> #include <libaegisub/fs.h>
#include <libaegisub/io.h> #include <libaegisub/io.h>
@ -91,15 +93,20 @@ std::vector<agi::fs::path> get_installed_fonts() {
using font_index = std::unordered_multimap<uint32_t, agi::fs::path>; using font_index = std::unordered_multimap<uint32_t, agi::fs::path>;
font_index index_fonts() { font_index index_fonts(FontCollectorStatusCallback &cb) {
font_index hash_to_path; font_index hash_to_path;
auto fonts = get_installed_fonts(); auto fonts = get_installed_fonts();
std::unique_ptr<char[]> buffer(new char[1024]); std::unique_ptr<char[]> buffer(new char[1024]);
for (auto const& path : fonts) { for (auto const& path : fonts) {
auto stream = agi::io::Open(path, true); try {
stream->read(&buffer[0], 1024); auto stream = agi::io::Open(path, true);
auto hash = murmur3(&buffer[0], stream->tellg()); stream->read(&buffer[0], 1024);
hash_to_path.emplace(hash, path); auto hash = murmur3(&buffer[0], stream->tellg());
hash_to_path.emplace(hash, path);
}
catch (agi::Exception const& e) {
cb(to_wx(e.GetMessage() + "\n"), 3);
}
} }
return hash_to_path; return hash_to_path;
} }
@ -126,7 +133,7 @@ GdiFontFileLister::GdiFontFileLister(FontCollectorStatusCallback &cb)
: dc(CreateCompatibleDC(nullptr), [](HDC dc) { DeleteDC(dc); }) : dc(CreateCompatibleDC(nullptr), [](HDC dc) { DeleteDC(dc); })
{ {
cb(_("Updating font cache\n"), 0); cb(_("Updating font cache\n"), 0);
index = index_fonts(); index = index_fonts(cb);
} }
CollectionResult GdiFontFileLister::GetFontPaths(std::string const& facename, int bold, bool italic, std::vector<int> const& characters) { CollectionResult GdiFontFileLister::GetFontPaths(std::string const& facename, int bold, bool italic, std::vector<int> const& characters) {