diff options
| author | Michael Lutz <michi@icosahedron.de> | 2021-02-13 22:44:45 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2021-02-14 11:48:58 +0100 |
| commit | 21a2cd7bc386207c68735edc05a21bb987dddd6b (patch) | |
| tree | 79334d04bcf0b491e09a982ce8813dda6a5071c5 /src | |
| parent | 8121706b89998769fc37c02e89205ca414358f82 (diff) | |
| download | openttd-21a2cd7bc386207c68735edc05a21bb987dddd6b.tar.xz | |
Codechange: Replace magic numbers by constants.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fontcache.cpp | 4 | ||||
| -rw-r--r-- | src/fontcache_internal.h | 3 | ||||
| -rw-r--r-- | src/os/windows/font_win32.cpp | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/fontcache.cpp b/src/fontcache.cpp index 6a0b500d8..50d2cf22e 100644 --- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -440,7 +440,7 @@ void FreeTypeFontCache::SetFontSize(FontSize fs, FT_Face face, int pixels) /* Font height is minimum height plus the difference between the default * height for this font size and the small size. */ int diff = scaled_height - ScaleFontTrad(_default_font_height[FS_SMALL]); - pixels = Clamp(std::min<uint>(head->Lowest_Rec_PPEM, 20u) + diff, scaled_height, MAX_FONT_SIZE); + pixels = Clamp(std::min<uint>(head->Lowest_Rec_PPEM, MAX_FONT_MIN_REC_SIZE) + diff, scaled_height, MAX_FONT_SIZE); } } else { pixels = ScaleFontTrad(pixels); @@ -608,7 +608,7 @@ const Sprite *FreeTypeFontCache::InternalGetGlyph(GlyphID key, bool aa) uint height = std::max(1U, (uint)slot->bitmap.rows + (this->fs == FS_NORMAL)); /* Limit glyph size to prevent overflows later on. */ - if (width > 256 || height > 256) usererror("Font glyph is too large"); + if (width > MAX_GLYPH_DIM || height > MAX_GLYPH_DIM) usererror("Font glyph is too large"); /* FreeType has rendered the glyph, now we allocate a sprite and copy the image into it */ SpriteLoader::Sprite sprite; diff --git a/src/fontcache_internal.h b/src/fontcache_internal.h index 09e676234..2f7454733 100644 --- a/src/fontcache_internal.h +++ b/src/fontcache_internal.h @@ -22,6 +22,9 @@ static const byte SHADOW_COLOUR = 2; /** Font cache for fonts that are based on a TrueType font. */ class TrueTypeFontCache : public FontCache { protected: + static constexpr int MAX_GLYPH_DIM = 256; ///< Maximum glyph dimensions. + static constexpr uint MAX_FONT_MIN_REC_SIZE = 20u; ///< Upper limit for the recommended font size in case a font file contains nonsensical values. + int req_size; ///< Requested font size. int used_size; ///< Used font size. diff --git a/src/os/windows/font_win32.cpp b/src/os/windows/font_win32.cpp index 4bcbb145d..7df24828b 100644 --- a/src/os/windows/font_win32.cpp +++ b/src/os/windows/font_win32.cpp @@ -414,7 +414,7 @@ void Win32FontCache::SetFontSize(FontSize fs, int pixels) /* Font height is minimum height plus the difference between the default * height for this font size and the small size. */ int diff = scaled_height - ScaleFontTrad(this->GetDefaultFontHeight(FS_SMALL)); - pixels = Clamp(std::min(otm->otmusMinimumPPEM, 20u) + diff, scaled_height, MAX_FONT_SIZE); + pixels = Clamp(std::min(otm->otmusMinimumPPEM, MAX_FONT_MIN_REC_SIZE) + diff, scaled_height, MAX_FONT_SIZE); SelectObject(dc, old); DeleteObject(temp); @@ -489,7 +489,7 @@ void Win32FontCache::ClearFontCache() uint height = std::max(1U, (uint)gm.gmBlackBoxY + (this->fs == FS_NORMAL)); /* Limit glyph size to prevent overflows later on. */ - if (width > 256 || height > 256) usererror("Font glyph is too large"); + if (width > MAX_GLYPH_DIM || height > MAX_GLYPH_DIM) usererror("Font glyph is too large"); /* GDI has rendered the glyph, now we allocate a sprite and copy the image into it. */ SpriteLoader::Sprite sprite; |