diff options
| author | Willem Jan Palenstijn | 2015-05-07 23:35:36 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-05-07 23:35:36 +0200 |
| commit | 57109ef0a8d30f15aa1fcef7d9d229fc9701f630 (patch) | |
| tree | 230c0a7822875e9c41a4606fce54166d4dc37db0 /graphics/fonts | |
| parent | d9e93f8e015ce27a95090e854494c4b3f7d1c0d4 (diff) | |
| parent | 04931d040085d77d031290fda57ca2c5dc486f54 (diff) | |
| download | scummvm-rg350-57109ef0a8d30f15aa1fcef7d9d229fc9701f630.tar.gz scummvm-rg350-57109ef0a8d30f15aa1fcef7d9d229fc9701f630.tar.bz2 scummvm-rg350-57109ef0a8d30f15aa1fcef7d9d229fc9701f630.zip | |
Merge branch 'master' into sherlock
Diffstat (limited to 'graphics/fonts')
| -rw-r--r-- | graphics/fonts/ttf.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp index 7373a965c8..dc7335f1c2 100644 --- a/graphics/fonts/ttf.cpp +++ b/graphics/fonts/ttf.cpp @@ -474,11 +474,11 @@ bool TTFFont::cacheGlyph(Glyph &glyph, uint32 chr) const { switch (bitmap.pixel_mode) { case FT_PIXEL_MODE_MONO: - for (uint y = 0; y < bitmap.rows; ++y) { + for (int y = 0; y < (int)bitmap.rows; ++y) { const uint8 *curSrc = src; uint8 mask = 0; - for (uint x = 0; x < bitmap.width; ++x) { + for (int x = 0; x < (int)bitmap.width; ++x) { if ((x % 8) == 0) mask = *curSrc++; @@ -494,7 +494,7 @@ bool TTFFont::cacheGlyph(Glyph &glyph, uint32 chr) const { break; case FT_PIXEL_MODE_GRAY: - for (uint y = 0; y < bitmap.rows; ++y) { + for (int y = 0; y < (int)bitmap.rows; ++y) { memcpy(dst, src, bitmap.width); dst += glyph.image.pitch; src += srcPitch; |