[Libreoffice-commits] core.git: vcl/unx

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Oct 8 15:29:40 UTC 2018


 vcl/unx/generic/glyphs/glyphcache.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b89bf7e197be88ca60c1910835080a26e092dfaa
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Mon Oct 8 13:38:32 2018 +0000
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Mon Oct 8 17:29:19 2018 +0200

    Run GarbageCollect() for freetype fonts
    
    Restores wrong hunk removed in commit dd36db168c65 ("UNX use font
    cache based glyph rect cache"), so we actually run the font
    based garbage collect. Just the glyph based one is gone.
    
    Change-Id: I30b4f9987d21764398ac00cf24968aa65aff8fc0
    Reviewed-on: https://gerrit.libreoffice.org/61536
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx
index c4bf10ac76c0..e1960f36dfb3 100644
--- a/vcl/unx/generic/glyphs/glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/glyphcache.cxx
@@ -196,7 +196,10 @@ FreetypeFont* GlyphCache::CacheFont(LogicalFontInstance* pFontInstance)
 void GlyphCache::UncacheFont( FreetypeFont& rFreetypeFont )
 {
     if( (rFreetypeFont.Release() <= 0) && (gnMaxSize <= mnBytesUsed) )
+    {
         mpCurrentGCFont = &rFreetypeFont;
+        GarbageCollect();
+    }
 }
 
 void GlyphCache::GarbageCollect()


More information about the Libreoffice-commits mailing list