summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2020-10-01 15:10:01 +0200
committerLuboš Luňák <l.lunak@collabora.com>2020-10-01 17:14:12 +0200
commita0cefd04fc2abaadea9b066596f22372179beeea (patch)
treee074b04286a546b1e5d5b8fcff418beae40dd397 /vcl
parent5f0492debf068c62604b936e68191257656ecbde (diff)
fix incorrect warning
I find it mildly amusing that the whole functions handles ScanlineFormat::TopDown except in its initial check. Change-Id: I4e3d818e9b27f3421b0db3d39b71ffcddefe52ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103766 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/bmpfast.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index cbf72d809490..9ee00b7bdd40 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -462,7 +462,8 @@ static bool ImplBlendToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine,
BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer,
const BitmapBuffer& rMskBuffer )
{
- SAL_WARN_IF( rMskBuffer.mnFormat != ScanlineFormat::N8BitPal, "vcl.gdi", "FastBmp BlendImage: unusual MSKFMT" );
+ SAL_WARN_IF(( rMskBuffer.mnFormat & ~ScanlineFormat::TopDown ) != ScanlineFormat::N8BitPal,
+ "vcl.gdi", "FastBmp BlendImage: unusual MSKFMT" );
const int nSrcLinestep = rSrcBuffer.mnScanlineSize;
int nMskLinestep = rMskBuffer.mnScanlineSize;