diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-21 22:14:03 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-21 22:29:42 +0200 |
| commit | 6257ea7d925080c930748b5c1120971f3aabc44d (patch) | |
| tree | 6aa662e601a91759fe736287fe462035ed87bdd9 /include | |
| parent | ColorMask: sal_uLong to better types, minor code rework (diff) | |
| download | core-6257ea7d925080c930748b5c1120971f3aabc44d.tar.gz core-6257ea7d925080c930748b5c1120971f3aabc44d.zip | |
sal_uLong to size_t
Change-Id: Ie1774045329f543c05316ba2acfa332e3b323c7c
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/salbtype.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index ee3b0f23a57b..2ad04bc45c47 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -419,7 +419,7 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) : { if( mnCount ) { - const sal_uLong nSize = mnCount * sizeof( BitmapColor ); + const size_t nSize = mnCount * sizeof( BitmapColor ); mpBitmapColor = reinterpret_cast<BitmapColor*>(new sal_uInt8[ nSize ]); memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize ); } @@ -432,7 +432,7 @@ inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) : { if( mnCount ) { - const sal_uLong nSize = mnCount * sizeof( BitmapColor ); + const size_t nSize = mnCount * sizeof( BitmapColor ); mpBitmapColor = reinterpret_cast<BitmapColor*>(new sal_uInt8[ nSize ]); memset( mpBitmapColor, 0, nSize ); } @@ -452,7 +452,7 @@ inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPale if( mnCount ) { - const sal_uLong nSize = mnCount * sizeof( BitmapColor ); + const size_t nSize = mnCount * sizeof( BitmapColor ); mpBitmapColor = reinterpret_cast<BitmapColor*>(new sal_uInt8[ nSize ]); memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize ); } @@ -508,8 +508,8 @@ inline void BitmapPalette::SetEntryCount( sal_uInt16 nCount ) } else if( nCount != mnCount ) { - const sal_uLong nNewSize = nCount * sizeof( BitmapColor ); - const sal_uLong nMinSize = std::min( mnCount, nCount ) * sizeof( BitmapColor ); + const size_t nNewSize = nCount * sizeof( BitmapColor ); + const size_t nMinSize = std::min( mnCount, nCount ) * sizeof( BitmapColor ); sal_uInt8* pNewColor = new sal_uInt8[ nNewSize ]; if ( nMinSize && mpBitmapColor ) |