diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-05-04 18:55:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-05 08:31:32 +0200 |
| commit | 53e720708b9d027a7df9908c75b1b82c8aca3c6a (patch) | |
| tree | 214164fcc91001354965ef2389d502b2b6b8fc02 /vcl/source/bitmap | |
| parent | c01e7f199bf0ed8e01f596034df79c5c16df69e5 (diff) | |
sal_uLong->sal_Int32 in Bitmap
Change-Id: I267fbdb8946d307440cb675f6ff985bf58db5e4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115108
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/bitmap')
| -rw-r--r-- | vcl/source/bitmap/BitmapEx.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/bitmap/BitmapWriteAccess.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/bitmap/bitmap.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx index 90c0ca8a47b5..2c56ab44b6a0 100644 --- a/vcl/source/bitmap/BitmapEx.cxx +++ b/vcl/source/bitmap/BitmapEx.cxx @@ -217,9 +217,9 @@ AlphaMask BitmapEx::GetAlpha() const return AlphaMask(maAlphaMask); } -sal_uLong BitmapEx::GetSizeBytes() const +sal_Int64 BitmapEx::GetSizeBytes() const { - sal_uLong nSizeBytes = maBitmap.GetSizeBytes(); + sal_Int64 nSizeBytes = maBitmap.GetSizeBytes(); if( !maAlphaMask.IsEmpty() ) nSizeBytes += maAlphaMask.GetSizeBytes(); @@ -376,7 +376,7 @@ bool BitmapEx::Convert( BmpConversion eConversion ) return !maBitmap.IsEmpty() && maBitmap.Convert( eConversion ); } -void BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, bool bExpandTransparent ) +void BitmapEx::Expand( sal_Int32 nDX, sal_Int32 nDY, bool bExpandTransparent ) { bool bRet = false; diff --git a/vcl/source/bitmap/BitmapWriteAccess.cxx b/vcl/source/bitmap/BitmapWriteAccess.cxx index d30477b9f257..c7fb31cc1406 100644 --- a/vcl/source/bitmap/BitmapWriteAccess.cxx +++ b/vcl/source/bitmap/BitmapWriteAccess.cxx @@ -67,7 +67,7 @@ void BitmapWriteAccess::CopyScanline(tools::Long nY, ConstScanline aSrcScanline, || (!HasPalette() && nFormat > ScanlineFormat::N8BitPal), "No copying possible between palette and non palette scanlines!"); - const sal_uLong nCount = std::min(GetScanlineSize(), nSrcScanlineSize); + const sal_uInt32 nCount = std::min(GetScanlineSize(), nSrcScanlineSize); if (!nCount) return; diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx index 99b8d10e9ef7..e093e0afabb5 100644 --- a/vcl/source/bitmap/bitmap.cxx +++ b/vcl/source/bitmap/bitmap.cxx @@ -850,7 +850,7 @@ bool Bitmap::CopyPixel_AlphaOptimized( const tools::Rectangle& rRectDst, const t } -bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor ) +bool Bitmap::Expand( sal_Int32 nDX, sal_Int32 nDY, const Color* pInitColor ) { bool bRet = false; |