diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-22 20:31:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-23 10:00:40 +0200 |
| commit | 2652675c417353bd0f072bc7c2579b6d24bf3eba (patch) | |
| tree | 567830fc849dfb9ed3350125466e59d510cbba03 /vcl/source/bitmap | |
| parent | 764b4e7b42791f82237c334ab123d1ae68cec898 (diff) | |
ofz: use BmpScaleFlag::Fast when recovering from bad svm mask size
this isn't supposed to happen and is an error recovery added by:
commit baebeb7de4c5f9511e45c2846ec2a72861a948c0
Date: Fri Jul 27 14:04:19 2012 +0000
Resolves: #i120165# Adapt Mask/Alpha at BitmapEx construction...
when size differs from base bitmap
so use the time-cheapest scaling available
Change-Id: I6ea8f458681dcb69e1c128040cc550dd86ff7151
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120855
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/bitmap')
| -rw-r--r-- | vcl/source/bitmap/BitmapEx.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx index 91ee55c58ed3..187b9290738e 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 ) : if (!maBitmap.IsEmpty() && maBitmap.GetSizePixel() != maAlphaMask.GetSizePixel()) { OSL_ENSURE(false, "Mask size differs from Bitmap size, corrected Mask (!)"); - maAlphaMask.Scale(maBitmap.GetSizePixel()); + maAlphaMask.Scale(maBitmap.GetSizePixel(), BmpScaleFlag::Fast); } } @@ -145,7 +145,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 (!)"); - maAlphaMask.Scale(rBmp.GetSizePixel()); + maAlphaMask.Scale(rBmp.GetSizePixel(), BmpScaleFlag::Fast); } } |