[Libreoffice-commits] core.git: vcl/generic

Tor Lillqvist tml at collabora.com
Sun Mar 1 23:33:42 PST 2015


 vcl/generic/glyphs/gcach_ftyp.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bc4a2d7ce9d4417f9d6cd58505d4ea3e959b1354
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Mar 2 09:29:48 2015 +0200

    WaE: comparison of integers of different signs
    
    Change-Id: Ie3c7fd8b72cd3cd3f9943c026ca348d9ed3c31f0

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index fd09cf4..b9c4d94 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1214,7 +1214,7 @@ 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 )
+            for( x = 0; x < static_cast<unsigned int>(rBitmapFT.width); ++x )
                 *(pDest++) = *(pSrc++);
             for(; x < rRawBitmap.mnScanlineSize; ++x )
                 *(pDest++) = 0;
@@ -1226,7 +1226,7 @@ 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 )
+            for( x = 0; x < static_cast<unsigned int>(rBitmapFT.width); ++x, nSrc+=nSrc )
             {
                 if( (x & 7) == 0 )
                     nSrc = *(pSrc++);


More information about the Libreoffice-commits mailing list