diff options
Diffstat (limited to 'vcl/aqua/source/gdi/salbmp.cxx')
| -rw-r--r-- | vcl/aqua/source/gdi/salbmp.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx index c1e7b7145914..00ae72b4fa9e 100644 --- a/vcl/aqua/source/gdi/salbmp.cxx +++ b/vcl/aqua/source/gdi/salbmp.cxx @@ -107,7 +107,7 @@ bool AquaSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits, // ------------------------------------------------------------------ -bool AquaSalBitmap::Create( const Size& rSize, USHORT nBits, const BitmapPalette& rBitmapPalette ) +bool AquaSalBitmap::Create( const Size& rSize, sal_uInt16 nBits, const BitmapPalette& rBitmapPalette ) { if( !isValidBitCount( nBits ) ) return false; @@ -134,7 +134,7 @@ bool AquaSalBitmap::Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) // ------------------------------------------------------------------ -bool AquaSalBitmap::Create( const SalBitmap& rSalBmp, USHORT nNewBitCount ) +bool AquaSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) { const AquaSalBitmap& rSourceBitmap = static_cast<const AquaSalBitmap&>(rSalBmp); @@ -563,7 +563,7 @@ Size AquaSalBitmap::GetSize() const // ------------------------------------------------------------------ -USHORT AquaSalBitmap::GetBitCount() const +sal_uInt16 AquaSalBitmap::GetBitCount() const { return mnBits; } @@ -572,9 +572,9 @@ USHORT AquaSalBitmap::GetBitCount() const static struct pal_entry { - BYTE mnRed; - BYTE mnGreen; - BYTE mnBlue; + sal_uInt8 mnRed; + sal_uInt8 mnGreen; + sal_uInt8 mnBlue; } const aImplSalSysPalEntryAry[ 16 ] = { @@ -629,9 +629,9 @@ const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome ) // own palette (6/6/6) const int DITHER_PAL_STEPS = 6; - const BYTE DITHER_PAL_DELTA = 51; + const sal_uInt8 DITHER_PAL_DELTA = 51; int nB, nG, nR; - BYTE nRed, nGreen, nBlue; + sal_uInt8 nRed, nGreen, nBlue; for( nB=0, nBlue=0; nB < DITHER_PAL_STEPS; nB++, nBlue += DITHER_PAL_DELTA ) { for( nG=0, nGreen=0; nG < DITHER_PAL_STEPS; nG++, nGreen += DITHER_PAL_DELTA ) |