diff options
| author | Paul Gilbert | 2015-10-12 15:18:03 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-10-12 15:18:03 -0400 |
| commit | b0016071ecf3f5ffbc6f1619af610ab648bbba3a (patch) | |
| tree | f00f6b17bfd3475200e454cdfc09eba94d764f01 /graphics | |
| parent | 652a6623156b6c6bba8ca49e038945fd0c2b7780 (diff) | |
| parent | fbcf667b6a57593a2b85622ad1e1380c8aef7210 (diff) | |
| download | scummvm-rg350-b0016071ecf3f5ffbc6f1619af610ab648bbba3a.tar.gz scummvm-rg350-b0016071ecf3f5ffbc6f1619af610ab648bbba3a.tar.bz2 scummvm-rg350-b0016071ecf3f5ffbc6f1619af610ab648bbba3a.zip | |
Merge branch 'msvc_2015' into xeen
Diffstat (limited to 'graphics')
| -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 ba57613601..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 (int y = 0; y < bitmap.rows; ++y) { + for (int y = 0; y < (int)bitmap.rows; ++y) { const uint8 *curSrc = src; uint8 mask = 0; - for (int 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 (int 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; |