[Libreoffice-commits] core.git: Branch 'feature/fixes19' - vcl/win

Tomaz Vajngerl tomaz.vajngerl at collabora.com
Mon Apr 4 14:08:45 UTC 2016


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

New commits:
commit e43faaf4c4842246026b7ee988f63a7dabb2846a
Author: Tomaz Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Mon Apr 4 16:07:17 2016 +0200

    fix compilation error
    
    Change-Id: If59355ca54fd04ff16953eabb321f6658b50a05c

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index c23f453..0855884 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -2678,10 +2678,12 @@ bool UniscribeLayout::CacheGlyphs(SalGraphics& rGraphics) const
     {
         for (int i = 0; i < mnGlyphCount; i++)
         {
-            if (mrWinFontEntry.GlyphIsCached(mpOutGlyphs[i]))
+            int nCodePoint = mpOutGlyphs[i];
+
+            if (mrWinFontEntry.GetGlyphCache().IsGlyphCached(nCodePoint))
                 continue;
 
-            if (!mrWinFontEntry.AddChunkOfGlyphs(true, mpOutGlyphs[i], *this, rGraphics))
+            if (!mrWinFontEntry.CacheGlyphToAtlas(true, nCodePoint, *this, rGraphics))
                 return false;
         }
     }


More information about the Libreoffice-commits mailing list