diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2024-09-01 03:59:16 +1000 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2024-09-13 11:14:04 +0200 |
| commit | 8f6f57e126c8e44f23fde6d35f027214a3fd557b (patch) | |
| tree | 552acf4aaaed35807c09cf16a93495bf3ddd857f | |
| parent | e5ef04874a73d87bc66578b73b44ca3e3a0e76ee (diff) | |
tdf#43157 vcl: remove OSL_ENSURE from BitmapEx functions
Change-Id: I8232751174dccc55139ab4878950636c32b1d6a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173199
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Jenkins
| -rw-r--r-- | vcl/source/bitmap/BitmapEx.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx index a1348749195b..9fe00bfec311 100644 --- a/vcl/source/bitmap/BitmapEx.cxx +++ b/vcl/source/bitmap/BitmapEx.cxx @@ -133,7 +133,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) : else { // convert to alpha bitmap - SAL_WARN( "vcl", "BitmapEx: forced mask to monochrome"); + SAL_WARN("vcl", "BitmapEx: forced mask to monochrome"); BitmapEx aMaskEx(rMask); BitmapFilter::Filter(aMaskEx, BitmapMonochromeFilter(255)); aMaskEx.Invert(); @@ -142,7 +142,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) : if (!maBitmap.IsEmpty() && maBitmap.GetSizePixel() != maAlphaMask.GetSizePixel()) { - OSL_ENSURE(false, "Mask size differs from Bitmap size, corrected Mask (!)"); + SAL_WARN("vcl", "Mask size differs from Bitmap size, corrected Mask (!)"); maAlphaMask.Scale(maBitmap.GetSizePixel(), BmpScaleFlag::Fast); } } @@ -154,7 +154,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) : { if (!maBitmap.IsEmpty() && !maAlphaMask.IsEmpty() && maBitmap.GetSizePixel() != maAlphaMask.GetSizePixel()) { - OSL_ENSURE(false, "Alpha size differs from Bitmap size, corrected Mask (!)"); + SAL_WARN("vcl", "Alpha size differs from Bitmap size, corrected Mask (!)"); maAlphaMask.Scale(rBmp.GetSizePixel(), BmpScaleFlag::Fast); } } @@ -925,7 +925,7 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod // determined and used -> this may be different from what is wanted here. // Better create a new bitmap with the needed color explicitly. BitmapScopedReadAccess xReadAccess(aChangedBitmap); - OSL_ENSURE(xReadAccess, "Got no Bitmap ReadAccess ?!?"); + SAL_WARN_IF(!xReadAccess, "vcl", "Got no Bitmap ReadAccess ?!?"); if(xReadAccess) { |