vcl/quartz/salgdicommon.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 17fdf034c144c64d6a9ebd3d8ace6096c9867944
Author: Tor Lillqvist <[email protected]>
AuthorDate: Tue Jun 4 21:00:27 2019 +0300
Commit: Tor Lillqvist <[email protected]>
CommitDate: Tue Jun 4 21:01:04 2019 +0300
tdf#122221: Bin apparently unnecessary early return
Removing these few lines of code fixes the problem on iOS, as far as I
can see. Let's hope it doesn't introduce any new issue in the iOS app.
In this branch, I didn't have the clout to remove them for macOS, too.
Change-Id: I2380d010ba223a698acfe916fca4580a1502be98
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index fbd49f60d459..5940b12b8343 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -571,11 +571,13 @@ bool AquaSalGraphics::drawAlphaBitmap( const SalTwoRect&
rTR,
const SalBitmap& rSrcBitmap,
const SalBitmap& rAlphaBmp )
{
+#ifndef IOS
if (rTR.mnSrcWidth != rTR.mnDestWidth || rTR.mnSrcHeight !=
rTR.mnDestHeight)
{
// TODO - would be better to scale it by the native code
return false;
}
+#endif
// An image mask can't have a depth > 8 bits (should be 1 to 8 bits)
if( rAlphaBmp.GetBitCount() > 8 )
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
