[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/quartz

[Tor Lillqvist (via logerrit)]

 vcl/quartz/salgdicommon.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9ccf626946bc881eefaa8b0a55f9ae3d07380daf
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Jun 4 21:00:27 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 14:38:25 2019 +0200

    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
    (cherry picked from commit 17fdf034c144c64d6a9ebd3d8ace6096c9867944)
    Reviewed-on: https://gerrit.libreoffice.org/79241
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index b5a22500873e..30ff4a8a7ea6 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -570,11 +570,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 )