Attachment 150453 Details for Bug 195869 – Fix

[patch] Fix

openttd.patch (text/plain), 1.27 KB, created by Dmitry Marakasov on 2014-12-11 02:24:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2014-12-11 02:24:12 UTC

Size: 1.27 KB

patch

obsolete

>Index: files/patch-src__fontcache.cpp
>===================================================================
>--- files/patch-src__fontcache.cpp	(revision 0)
>+++ files/patch-src__fontcache.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- src/fontcache.cpp.orig	2014-10-21 22:36:35.000000000 +0400
>++++ src/fontcache.cpp	2014-12-11 05:19:50.000000000 +0300
>+@@ -527,8 +527,8 @@
>+ 	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));
>++	unsigned int width  = max(1U, slot->bitmap.width + (this->fs == FS_NORMAL));
>++	unsigned int height = max(1U, 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");
>
>Property changes on: files/patch-src__fontcache.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 195869: 150453