diff options
| author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
| commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
| tree | 503d50902bad2d800165593039d08d5ccf0c98ab /graphics | |
| parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
| parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
| download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip | |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
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; |