[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/quartz

[Tor Lillqvist (via logerrit)]

 vcl/quartz/salgdicommon.cxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit b0f9715174dc0001b2e738bd230f496432ab5ac6
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Jun 4 18:58:56 2019 +0300
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Jun 20 23:52:59 2019 +0200

    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 at googlemail.com>

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 333c23c93035..af70708eb0f2 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -587,12 +587,6 @@ bool AquaSalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
                                        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;