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

[Khaled Hosny]

 vcl/quartz/ctfonts.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7dc1f5da3581c048d977cb18699fd44ea1c4d465
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Wed Feb 22 23:56:19 2017 +0200

    tdf#104509: Fix GetGlyphBoundRect on Mac
    
    The rectangle top and bottom were mixed up! I tried to fix this in
    8cef9b4dbafdebc0566d6d7f715f27f978ddfe5b, but it was not the right fix.
    
    Change-Id: Ia033ff2823bfd641e830d748d413d7791bfee5b8
    Reviewed-on: https://gerrit.libreoffice.org/34557
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>
    (cherry picked from commit 04d086531ff4a3ab24b704489270c7c23792bd20)
    Reviewed-on: https://gerrit.libreoffice.org/34559
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 659a38ba7678c7a62ba0872f390c59329daadb90)
    Reviewed-on: https://gerrit.libreoffice.org/34579
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 20f5414..fca177e 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -184,9 +184,9 @@ bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
         aCGRect = CGRectApplyAffineTransform(aCGRect, CGAffineTransformMakeRotation(mfFontRotation));
 
     rRect.Left()   = lrint( aCGRect.origin.x );
-    rRect.Top()    = lrint(-aCGRect.origin.y );
+    rRect.Top()    = lrint(-aCGRect.origin.y - aCGRect.size.height );
     rRect.Right()  = lrint( aCGRect.origin.x + aCGRect.size.width );
-    rRect.Bottom() = lrint( aCGRect.origin.y - aCGRect.size.height );
+    rRect.Bottom() = lrint(-aCGRect.origin.y );
     return true;
 }