[Libreoffice-commits] core.git: Branch 'private/tml/fixwintext' - vcl/win

[Tor Lillqvist]

 vcl/win/gdi/salfont.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f771b7ac219ccb6eea4afc94445ab2702f6cd4e6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Mar 14 07:29:14 2016 +0200

    Fix what seems to have been off-by-one errors in glyph bounds calculation
    
    For some reason the error had a visible impact (as far as I an see,
    anyway) only for Graphite fonts. The bottommost pixels were cut
    off. (Also leftmost, but that was not so easily visible.)
    
    <tools/gen.hxx> Rectangle type, I love you.
    
    Change-Id: I6f7438ec21d2bc1b9bef31cd70e649856f7ec7d5

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index a47f3d1..3278e88 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -2014,9 +2014,9 @@ bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
     rRect = Rectangle( Point( +aGM.gmptGlyphOrigin.x, -aGM.gmptGlyphOrigin.y ),
         Size( aGM.gmBlackBoxX, aGM.gmBlackBoxY ) );
     rRect.Left()    = static_cast<int>( mfCurrentFontScale * rRect.Left() );
-    rRect.Right()   = static_cast<int>( mfCurrentFontScale * rRect.Right() );
+    rRect.Right()   = static_cast<int>( mfCurrentFontScale * rRect.Right() ) + 1;
     rRect.Top()     = static_cast<int>( mfCurrentFontScale * rRect.Top() );
-    rRect.Bottom()  = static_cast<int>( mfCurrentFontScale * rRect.Bottom() );
+    rRect.Bottom()  = static_cast<int>( mfCurrentFontScale * rRect.Bottom() ) + 1;
     return true;
 }