diff options
Diffstat (limited to 'games/openttd/patches/patch-src_fontcache.cpp')
| -rw-r--r-- | games/openttd/patches/patch-src_fontcache.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/games/openttd/patches/patch-src_fontcache.cpp b/games/openttd/patches/patch-src_fontcache.cpp deleted file mode 100644 index d3280b645c4..00000000000 --- a/games/openttd/patches/patch-src_fontcache.cpp +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-src_fontcache.cpp,v 1.2 2015/06/19 00:49:14 dholland Exp $ - -bitmap.width and bitmap.rows are unsigned in some versions of freetype -(but not others) -- because C++ requires max() to be homogeneous with -respect to sign, if it's unsigned the constant needs to be 1U, and if -it's not, it needs not to be. Which becomes a problem. So, since none -of this should ever be negative, force it all to unsigned. - ---- src/fontcache.cpp.orig 2014-12-11 21:17:16.000000000 +0000 -+++ src/fontcache.cpp -@@ -481,8 +481,8 @@ const Sprite *FreeTypeFontCache::GetGlyp - aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY); - - /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ -- int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); -- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); -+ int width = max(1U, (unsigned)(slot->bitmap.width + (this->fs == FS_NORMAL))); -+ int height = max(1U, (unsigned)(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"); |