commit b0f9715174dc0001b2e738bd230f496432ab5ac6
author Tor Lillqvist <tml@collabora.com> Tue Jun 04 18:58:56 2019 +0300
committer Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Thu Jun 20 23:52:59 2019 +0200
tree b3bb1c7f72d14b3266e153bd65ea061d23c05cd2
parent 8724448a2434a08ab2f5ac20b2285d94379189fe

tdf#122221: Bin apparently unnecessary early return

Removing these few lines of code fixes the problem on iOS, and has no
apparent ill effect on macOS. But sure, I didn't check that thoroughly
on macOS, so in case this has a bad effect on macOS after all, need to
reinstate the few lines but make them #ifndef IOS.

(Still passes make check.)

Change-Id: I2380d010ba223a698acfe916fca4580a1502be98
Reviewed-on: https://gerrit.libreoffice.org/73470
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

vcl/quartz/salgdicommon.cxx

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 333c23c..af70708 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -587,12 +587,6 @@
                                       const SalBitmap& rSrcBitmap,
                                       const SalBitmap& rAlphaBmp )
{
    if (rTR.mnSrcWidth != rTR.mnDestWidth || rTR.mnSrcHeight != rTR.mnDestHeight)
    {
        // TODO - would be better to scale it by the native code
        return false;
    }

    // An image mask can't have a depth > 8 bits (should be 1 to 8 bits)
    if( rAlphaBmp.GetBitCount() > 8 )
        return false;