summaryrefslogtreecommitdiff
path: root/src/os/windows
diff options
context:
space:
mode:
authorMichael Lutz <michi@icosahedron.de>2021-02-13 22:44:45 +0100
committerMichael Lutz <michi@icosahedron.de>2021-02-14 11:48:58 +0100
commit21a2cd7bc386207c68735edc05a21bb987dddd6b (patch)
tree79334d04bcf0b491e09a982ce8813dda6a5071c5 /src/os/windows
parent8121706b89998769fc37c02e89205ca414358f82 (diff)
downloadopenttd-21a2cd7bc386207c68735edc05a21bb987dddd6b.tar.xz
Codechange: Replace magic numbers by constants.
Diffstat (limited to 'src/os/windows')
-rw-r--r--src/os/windows/font_win32.cpp4
1 files changed, 2 insertions, 2 deletions
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;