diff options
Diffstat (limited to 'vcl/source/gdi/alpha.cxx')
| -rw-r--r-- | vcl/source/gdi/alpha.cxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx index d144fe550882..6107affaf4e9 100644 --- a/vcl/source/gdi/alpha.cxx +++ b/vcl/source/gdi/alpha.cxx @@ -59,7 +59,7 @@ AlphaMask::AlphaMask( const AlphaMask& rAlphaMask ) : // ----------------------------------------------------------------------------- -AlphaMask::AlphaMask( const Size& rSizePixel, BYTE* pEraseTransparency ) : +AlphaMask::AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency ) : Bitmap( rSizePixel, 8, &Bitmap::GetGreyPalette( 256 ) ) { if( pEraseTransparency ) @@ -108,14 +108,14 @@ Bitmap AlphaMask::GetBitmap() const // ----------------------------------------------------------------------------- -BOOL AlphaMask::Crop( const Rectangle& rRectPixel ) +sal_Bool AlphaMask::Crop( const Rectangle& rRectPixel ) { return Bitmap::Crop( rRectPixel ); } // ----------------------------------------------------------------------------- -BOOL AlphaMask::Expand( ULONG nDX, ULONG nDY, BYTE* pInitTransparency ) +sal_Bool AlphaMask::Expand( sal_uLong nDX, sal_uLong nDY, sal_uInt8* pInitTransparency ) { Color aColor; @@ -127,7 +127,7 @@ BOOL AlphaMask::Expand( ULONG nDX, ULONG nDY, BYTE* pInitTransparency ) // ----------------------------------------------------------------------------- -BOOL AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, +sal_Bool AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const AlphaMask* pAlphaSrc ) { // Note: this code is copied from Bitmap::CopyPixel but avoids any palette lookups @@ -135,7 +135,7 @@ BOOL AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const Size aSizePix( GetSizePixel() ); Rectangle aRectDst( rRectDst ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; aRectDst.Intersection( Rectangle( Point(), aSizePix ) ); @@ -226,7 +226,7 @@ BOOL AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, } ReleaseAccess( pWriteAcc ); - bRet = TRUE; + bRet = sal_True; } } } @@ -238,26 +238,26 @@ BOOL AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, // ----------------------------------------------------------------------------- -BOOL AlphaMask::Erase( BYTE cTransparency ) +sal_Bool AlphaMask::Erase( sal_uInt8 cTransparency ) { return Bitmap::Erase( Color( cTransparency, cTransparency, cTransparency ) ); } // ----------------------------------------------------------------------------- -BOOL AlphaMask::Invert() +sal_Bool AlphaMask::Invert() { BitmapWriteAccess* pAcc = AcquireWriteAccess(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pAcc && pAcc->GetBitCount() == 8 ) { BitmapColor aCol( 0 ); const long nWidth = pAcc->Width(), nHeight = pAcc->Height(); - BYTE* pMap = new BYTE[ 256 ]; + sal_uInt8* pMap = new sal_uInt8[ 256 ]; for( long i = 0; i < 256; i++ ) - pMap[ i ] = ~(BYTE) i; + pMap[ i ] = ~(sal_uInt8) i; for( long nY = 0L; nY < nHeight; nY++ ) { @@ -269,7 +269,7 @@ BOOL AlphaMask::Invert() } delete[] pMap; - bRet = TRUE; + bRet = sal_True; } if( pAcc ) @@ -280,16 +280,16 @@ BOOL AlphaMask::Invert() // ----------------------------------------------------------------------------- -BOOL AlphaMask::Mirror( ULONG nMirrorFlags ) +sal_Bool AlphaMask::Mirror( sal_uLong nMirrorFlags ) { return Bitmap::Mirror( nMirrorFlags ); } // ----------------------------------------------------------------------------- -BOOL AlphaMask::Scale( const Size& rNewSize, ULONG nScaleFlag ) +sal_Bool AlphaMask::Scale( const Size& rNewSize, sal_uLong nScaleFlag ) { - BOOL bRet = Bitmap::Scale( rNewSize, nScaleFlag ); + sal_Bool bRet = Bitmap::Scale( rNewSize, nScaleFlag ); if( bRet && ( nScaleFlag == BMP_SCALE_INTERPOLATE ) ) Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS ); @@ -299,9 +299,9 @@ BOOL AlphaMask::Scale( const Size& rNewSize, ULONG nScaleFlag ) // ----------------------------------------------------------------------------- -BOOL AlphaMask::Scale( const double& rScaleX, const double& rScaleY, ULONG nScaleFlag ) +sal_Bool AlphaMask::Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag ) { - BOOL bRet = Bitmap::Scale( rScaleX, rScaleY, nScaleFlag ); + sal_Bool bRet = Bitmap::Scale( rScaleX, rScaleY, nScaleFlag ); if( bRet && ( nScaleFlag == BMP_SCALE_INTERPOLATE ) ) Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS ); @@ -311,18 +311,18 @@ BOOL AlphaMask::Scale( const double& rScaleX, const double& rScaleY, ULONG nScal // ----------------------------------------------------------------------------- -BOOL AlphaMask::Rotate( long nAngle10, BYTE cFillTransparency ) +sal_Bool AlphaMask::Rotate( long nAngle10, sal_uInt8 cFillTransparency ) { return Bitmap::Rotate( nAngle10, Color( cFillTransparency, cFillTransparency, cFillTransparency ) ); } // ----------------------------------------------------------------------------- -BOOL AlphaMask::Replace( const Bitmap& rMask, BYTE cReplaceTransparency ) +sal_Bool AlphaMask::Replace( const Bitmap& rMask, sal_uInt8 cReplaceTransparency ) { BitmapReadAccess* pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess(); BitmapWriteAccess* pAcc = AcquireWriteAccess(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pMaskAcc && pAcc ) { @@ -345,14 +345,14 @@ BOOL AlphaMask::Replace( const Bitmap& rMask, BYTE cReplaceTransparency ) // ----------------------------------------------------------------------------- -BOOL AlphaMask::Replace( BYTE cSearchTransparency, BYTE cReplaceTransparency, ULONG +sal_Bool AlphaMask::Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong #ifdef DBG_UTIL nTol #endif ) { BitmapWriteAccess* pAcc = AcquireWriteAccess(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; DBG_ASSERT( !nTol, "AlphaMask::Replace: nTol not used yet" ); @@ -387,7 +387,7 @@ nTol } } - bRet = TRUE; + bRet = sal_True; } if( pAcc ) @@ -398,17 +398,17 @@ nTol // ----------------------------------------------------------------------------- -BOOL AlphaMask::Replace( BYTE* pSearchTransparencies, BYTE* pReplaceTransparencies, - ULONG nColorCount, ULONG* pTols ) +sal_Bool AlphaMask::Replace( sal_uInt8* pSearchTransparencies, sal_uInt8* pReplaceTransparencies, + sal_uLong nColorCount, sal_uLong* pTols ) { Color* pSearchColors = new Color[ nColorCount ]; Color* pReplaceColors = new Color[ nColorCount ]; - BOOL bRet; + sal_Bool bRet; - for( ULONG i = 0; i < nColorCount; i++ ) + for( sal_uLong i = 0; i < nColorCount; i++ ) { - const BYTE cSearchTransparency = pSearchTransparencies[ i ]; - const BYTE cReplaceTransparency = pReplaceTransparencies[ i ]; + const sal_uInt8 cSearchTransparency = pSearchTransparencies[ i ]; + const sal_uInt8 cReplaceTransparency = pReplaceTransparencies[ i ]; pSearchColors[ i ] = Color( cSearchTransparency, cSearchTransparency, cSearchTransparency ); pReplaceColors[ i ] = Color( cReplaceTransparency, cReplaceTransparency, cReplaceTransparency ); |