Kaydet (Commit) e60f6ac2 authored tarafından Michael Stahl's avatar Michael Stahl

Revert "WaE: comparison of integers of different signs"

This is pointless, the GCC warning was fixed in the previous commit and
FT_Bitmap.width is of type "unsigned int" already.

This reverts commit bc4a2d7c.
üst e0cf60a4
...@@ -1206,7 +1206,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) ...@@ -1206,7 +1206,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
unsigned int x; unsigned int x;
for( int y = rRawBitmap.mnHeight; --y >= 0 ; ) for( int y = rRawBitmap.mnHeight; --y >= 0 ; )
{ {
for( x = 0; x < static_cast<unsigned int>(rBitmapFT.width); ++x ) for( x = 0; x < rBitmapFT.width; ++x )
*(pDest++) = *(pSrc++); *(pDest++) = *(pSrc++);
for(; x < rRawBitmap.mnScanlineSize; ++x ) for(; x < rRawBitmap.mnScanlineSize; ++x )
*(pDest++) = 0; *(pDest++) = 0;
...@@ -1218,7 +1218,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) ...@@ -1218,7 +1218,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
for( int y = rRawBitmap.mnHeight; --y >= 0 ; ) for( int y = rRawBitmap.mnHeight; --y >= 0 ; )
{ {
unsigned char nSrc = 0; unsigned char nSrc = 0;
for( x = 0; x < static_cast<unsigned int>(rBitmapFT.width); ++x, nSrc+=nSrc ) for( x = 0; x < rBitmapFT.width; ++x, nSrc+=nSrc )
{ {
if( (x & 7) == 0 ) if( (x & 7) == 0 )
nSrc = *(pSrc++); nSrc = *(pSrc++);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment