anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not crash is release mode if we stumble across an unrealized font.

Browse Source
This commit is contained in:
Richard Heck 2016-07-18 13:01:42 -04:00
parent 7575ad159b
commit 3203fb1c5f
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/frontends/qt4/GuiFontLoader.cpp
View File

@ -95,11 +95,24 @@ static GuiFontInfo * fontinfo_[NUM_FAMILIES][NUM_SERIES][NUM_SHAPE][NUM_SIZE];
// if not cached, create it. // if not cached, create it.
GuiFontInfo & fontinfo(FontInfo const & f) GuiFontInfo & fontinfo(FontInfo const & f)
{ {
// LASSERT: Is there anything we might do here besides crash? bool const fontIsRealized =
LBUFERR(f.family() < NUM_FAMILIES); (f.family() < NUM_FAMILIES) &&
LBUFERR(f.series() < NUM_SERIES); (f.series() < NUM_SERIES) &&
LBUFERR(f.realShape() < NUM_SHAPE); (f.realShape() < NUM_SHAPE) &&
LBUFERR(f.size() < NUM_SIZE); (f.size() < NUM_SIZE);
if (!fontIsRealized) {
// We can reset the font to something sensible in release mode.
LATTEST(false);
LYXERR0("Unrealized font!");
// We could be fancier here, if we wanted, and just fix things where
// there is a problem. But it doesn't seem worth it, since we should
// not be here in the first place.
GuiFontInfo * & fi =
fontinfo_[sane_font.family()][sane_font.series()][sane_font.realShape()][sane_font.size()];
if (!fi)
fi = new GuiFontInfo(f);
return *fi;
}
// fi is a reference to the pointer type (GuiFontInfo *) in the // fi is a reference to the pointer type (GuiFontInfo *) in the
// fontinfo_ table. // fontinfo_ table.
GuiFontInfo * & fi = GuiFontInfo * & fi =