evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

catch image processing errors in font rendering

Browse Source 
think this was done before and accidentally undone
This commit is contained in:
Kae 2024-05-03 08:53:18 +10:00
parent 6fc52e2fe7
commit de3d099d51
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/rendering/StarFontTextureGroup.cpp
View File

@ -62,26 +62,36 @@ const FontTextureGroup::GlyphTexture& FontTextureGroup::glyphTexture(String::Cha
Directives const& directives = *processingDirectives; Directives const& directives = *processingDirectives;
Vec2F preSize = Vec2F(image.size()); Vec2F preSize = Vec2F(image.size());
bool broken = false;
for (auto& entry : directives->entries) { for (auto& entry : directives->entries) {
if (auto error = entry.operation.ptr<ErrorImageOperation>()) { if (auto error = entry.operation.ptr<ErrorImageOperation>()) {
if (auto string = error->cause.ptr<std::string>()) { if (auto string = error->cause.ptr<std::string>()) {
if (!string->empty()) { if (!string->empty()) {
Logger::error("Error parsing font directives: {}", *string); Logger::error("Error in parsed font directives: {}", *string);
string->clear(); string->clear();
} }
} else if (auto& exception = error->cause.get<std::exception_ptr>()) { } else if (auto& exception = error->cause.get<std::exception_ptr>()) {
try try
{ std::rethrow_exception(error->cause.get<std::exception_ptr>()); } { std::rethrow_exception(error->cause.get<std::exception_ptr>()); }
catch (std::exception const& e) catch (std::exception const& e)
{ Logger::error("Exception parsing font directives: {}", e.what()); }; { Logger::error("Exception in parsed font directives: {}", e.what()); };
exception = {}; exception = {};
} }
broken |= true;
} else {
try { processImageOperation(entry.operation, image); }
catch (StarException const& e) {
broken |= true;
Logger::error("Exception processing font directives for {}px '{}': {}", size, String(c), e.what());
}
}
}
if (broken) {
glyphTexture.colored = true;
image.forEachPixel([](unsigned x, unsigned y, Vec4B& pixel) { image.forEachPixel([](unsigned x, unsigned y, Vec4B& pixel) {
pixel = ((x + y) % 2 == 0) ? Vec4B(255, 0, 255, pixel[3]) : Vec4B(0, 0, 0, pixel[3]); pixel = ((x + y) % 2 == 0) ? Vec4B(255, 0, 255, pixel[3]) : Vec4B(0, 0, 0, pixel[3]);
}); });
glyphTexture.colored = true;
} else
processImageOperation(entry.operation, image);
} }
glyphTexture.offset = (preSize - Vec2F(image.size())) / 2; glyphTexture.offset = (preSize - Vec2F(image.size())) / 2;