# HG changeset patch
# User Rik <rik@octave.org>
# Date 1586646379 25200
# Node ID ab60e78d235cfddbcc05bf31142691bb28d32b9a
# Parent  1ef597f9b0bbc557ec6d54181cfe700f22c6ea8b# Parent  11d66485fc192dcac5960d215fec02e069606752
maint: merge stable to default.

diff -r 1ef597f9b0bb -r ab60e78d235c libinterp/corefcn/ft-text-renderer.cc
--- a/libinterp/corefcn/ft-text-renderer.cc	Sat Apr 11 20:47:26 2020 +0200
+++ b/libinterp/corefcn/ft-text-renderer.cc	Sat Apr 11 16:06:19 2020 -0700
@@ -398,8 +398,8 @@
               retval->generic.finalizer = ft_face_destroyed;
 
               // Insert loaded font into the cache.
-
-              cache[key] = retval;
+              if (FT_Reference_Face (retval) == 0)
+                cache[key] = retval;
             }
 #endif
         }
@@ -416,6 +416,7 @@
           cache.erase (*pkey);
           delete pkey;
           face->generic.data = nullptr;
+          FT_Done_Face (face);
         }
     }