diff options
Diffstat (limited to 'vcl/generic/glyphs/gcach_ftyp.cxx')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 823b568311f1..1c9d17788837 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -1206,7 +1206,8 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) unsigned int x; for( int y = rRawBitmap.mnHeight; --y >= 0 ; ) { - for( x = 0; x < rBitmapFT.width; ++x ) + // note width is "int" in freetype 2.4.8 and "unsigned int" in 2.5.5 + for (x = 0; x < static_cast<unsigned int>(rBitmapFT.width); ++x) *(pDest++) = *(pSrc++); for(; x < rRawBitmap.mnScanlineSize; ++x ) *(pDest++) = 0; @@ -1218,7 +1219,8 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) for( int y = rRawBitmap.mnHeight; --y >= 0 ; ) { unsigned char nSrc = 0; - for( x = 0; x < rBitmapFT.width; ++x, nSrc+=nSrc ) + // note width is "int" in freetype 2.4.8 and "unsigned int" in 2.5.5 + for (x = 0; x < static_cast<unsigned int>(rBitmapFT.width); ++x, nSrc+=nSrc) { if( (x & 7) == 0 ) nSrc = *(pSrc++); |