Skip to content

C
core
Kaydet (Commit) 6257ea7d authored tarafından Matteo Casalin's avatar Matteo Casalin
Dosyalara gözat
Seçenekler

sal_uLong to size_t 

Change-Id: Ie1774045329f543c05316ba2acfa332e3b323c7c
üst adc5e7d5
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
include/vcl/salbtype.hxx
Dosyayı görüntüle @ 6257ea7d
......@@ -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 )
......
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