diff options
| author | planetmaker <planetmaker@openttd.org> | 2014-12-11 12:25:53 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2014-12-11 12:25:53 +0000 |
| commit | 24fec6da12fbc7ba4c9050f8afa5f05970c346bb (patch) | |
| tree | 07ae5b7ab6e39d0ed50a239a9e0269b5bc07e079 | |
| parent | 141b5d7050933eac015fb64bb32f006ade4124f9 (diff) | |
| download | openttd-24fec6da12fbc7ba4c9050f8afa5f05970c346bb.tar.xz | |
(svn r27079) -Fix: Compilation with freetype2 version 2.5.4 and newer (AMDmi3)
| -rwxr-xr-x | findversion.sh | 6 | ||||
| -rw-r--r-- | src/fontcache.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/findversion.sh b/findversion.sh index 362d9b545..6be52b696 100755 --- a/findversion.sh +++ b/findversion.sh @@ -112,15 +112,15 @@ elif [ -d "$ROOT_DIR/.hg" ]; then HASH=`LC_ALL=C HGPLAIN= hg id -i | cut -c1-12` REV="h`echo $HASH | cut -c1-8`" BRANCH="`HGPLAIN= hg branch | sed 's@^default$@@'`" - TAG="`hg id -t | grep -v 'tip$'`" + TAG="`HGPLAIN= hg id -t | grep -v 'tip$'`" if [ -n "$TAG" ]; then BRANCH="" REV="$TAG" fi - REV_NR=`LC_ALL=C hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"` + REV_NR=`LC_ALL=C HGPLAIN= hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"` if [ -z "$REV_NR" ]; then # No rev? Maybe it is a custom hgsubversion clone - REV_NR=`LC_ALL=C hg parent --template="{svnrev}"` + REV_NR=`LC_ALL=C HGPLAIN= hg parent --template="{svnrev}"` fi elif [ -f "$ROOT_DIR/.ottdrev" ]; then # We are an exported source bundle diff --git a/src/fontcache.cpp b/src/fontcache.cpp index a65585627..e6f1e3725 100644 --- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -536,8 +536,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key) 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, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); + unsigned int height = max(1U, (unsigned int)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"); @@ -553,8 +553,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key) /* Draw shadow for medium size */ if (this->fs == FS_NORMAL && !aa) { - for (int y = 0; y < slot->bitmap.rows; y++) { - for (int x = 0; x < slot->bitmap.width; x++) { + for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { + for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; sprite.data[1 + x + (1 + y) * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF; @@ -563,8 +563,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key) } } - for (int y = 0; y < slot->bitmap.rows; y++) { - for (int x = 0; x < slot->bitmap.width; x++) { + for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { + for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { sprite.data[x + y * sprite.width].m = FACE_COLOUR; sprite.data[x + y * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF; |