[cairo-commit] 2 commits - src/cairo-surface.c

[GitLab Mirror]

 src/cairo-surface.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 04232d987172183b3e9bb59a0dbab4ca932f7c8d
Merge: a934fa66d 0e284245d
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Fri Apr 22 12:32:21 2022 +0000

    Merge branch 'font-status' into 'master'
    
    Check font status in show_text_glyphs
    
    See merge request cairo/cairo!307

commit 0e284245d7712b3a3c115a68f18c46d6df838284
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Tue Apr 5 17:38:13 2022 +0930

    Check font status in show_text_glyphs
    
    to prevent asserting in _cairo_scaled_font_freeze_cache()

diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index 2fc265a2c..809a2739c 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -2840,7 +2840,7 @@ _cairo_surface_show_text_glyphs (cairo_surface_t	    *surface,
 				 int			     num_clusters,
 				 cairo_text_cluster_flags_t  cluster_flags,
 				 cairo_scaled_font_t	    *scaled_font,
-				 const cairo_clip_t		*clip)
+				 const cairo_clip_t	    *clip)
 {
     cairo_int_status_t status;
     char *utf8_copy = NULL;
@@ -2861,6 +2861,10 @@ _cairo_surface_show_text_glyphs (cairo_surface_t	    *surface,
     if (unlikely (status))
 	return status;
 
+    status = cairo_scaled_font_status (scaled_font);
+    if (unlikely (status))
+	return status;
+
     if (nothing_to_do (surface, op, source))
 	return CAIRO_STATUS_SUCCESS;