vcl/source/gdi/bmpfast.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a0cefd04fc2abaadea9b066596f22372179beeea
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Oct 1 15:10:01 2020 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Thu Oct 1 17:14:12 2020 +0200
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.lu...@collabora.com>
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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
