diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-02 08:06:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-14 18:42:03 +0200 |
| commit | 3725977b0dd5b1d04eebc9b8c62c0daa4e9d1e87 (patch) | |
| tree | ab21be91f5e2277bf596a22666fd260fc222b8f3 /vcl | |
| parent | acddaea669fcb30660f1844e84582ce11e344441 (diff) | |
-Werror,-Wsign-compare
Change-Id: I18e4249d574f0d48e2c2027a89a37125d09e6702
(cherry picked from commit 08a9452b677bc68f56fbac3638cfaeff9f90b1eb)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 2db0f0d98d34..dab5479ac205 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -1211,17 +1211,19 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) unsigned char* pDest = rRawBitmap.mpBits.get(); if( !bEmbedded ) { - for( int y = rRawBitmap.mnHeight, x; --y >= 0 ; ) + unsigned int x; + for( int y = rRawBitmap.mnHeight; --y >= 0 ; ) { for( x = 0; x < rBitmapFT.width; ++x ) *(pDest++) = *(pSrc++); - for(; x < int(rRawBitmap.mnScanlineSize); ++x ) + for(; x < rRawBitmap.mnScanlineSize; ++x ) *(pDest++) = 0; } } else { - for( int y = rRawBitmap.mnHeight, x; --y >= 0 ; ) + unsigned int x; + for( int y = rRawBitmap.mnHeight; --y >= 0 ; ) { unsigned char nSrc = 0; for( x = 0; x < rBitmapFT.width; ++x, nSrc+=nSrc ) @@ -1230,7 +1232,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) nSrc = *(pSrc++); *(pDest++) = (0x7F - nSrc) >> 8; } - for(; x < int(rRawBitmap.mnScanlineSize); ++x ) + for(; x < rRawBitmap.mnScanlineSize; ++x ) *(pDest++) = 0; } } |