[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - vcl/generic

[Tor Lillqvist]

 vcl/generic/glyphs/gcach_ftyp.cxx |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit c4cbfb6352339b88977e5f17c5eb948eb600b7bc
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
    (cherry picked from commit bc4a2d7ce9d4417f9d6cd58505d4ea3e959b1354)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index dab5479..8481bba 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++);
commit 3725977b0dd5b1d04eebc9b8c62c0daa4e9d1e87
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Mar 2 08:06:45 2015 +0200

    -Werror,-Wsign-compare
    
    Change-Id: I18e4249d574f0d48e2c2027a89a37125d09e6702
    (cherry picked from commit 08a9452b677bc68f56fbac3638cfaeff9f90b1eb)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 2db0f0d..dab5479 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;
         }
     }