[cairo-commit] 2 commits - src/cairo-scaled-font.c

[GitLab Mirror]

 src/cairo-scaled-font.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5ecfc2eb5d1fe743cdcffc8556a9ae20cb8bd245
Merge: 72cc5ae5f 5e73c107f
Author: Uli Schlachter <psychon at znc.in>
Date:   Tue Jan 10 17:10:10 2023 +0000

    Merge branch 'bug-607' into 'master'
    
    Don't leave a font face in an error state after a scaled font creation failure
    
    Closes #607
    
    See merge request cairo/cairo!402

commit 5e73c107f5536852154c23d7490b6a5e5d9d5967
Author: Fujii Hironori <Hironori.Fujii at sony.com>
Date:   Tue Jan 10 16:01:20 2023 +0900

    Don't leave a font face in an error state after a scaled font creation failure
    
    Scaled font creation may fail if the font size is very large on
    win32. But, don't leave the font face in an error state in such
    case.
    
    Fixes cairo/cairo#607

diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index a1728def3..83f1e1eed 100755
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -1176,9 +1176,7 @@ cairo_scaled_font_create (cairo_font_face_t          *font_face,
 
     status = font_face->backend->scaled_font_create (font_face, font_matrix,
 						     ctm, options, &scaled_font);
-    /* Did we leave the backend in an error state? */
     if (unlikely (status)) {
-	status = _cairo_font_face_set_error (font_face, status);
 	_cairo_scaled_font_map_unlock ();
 	if (font_face != original_font_face)
 	    cairo_font_face_destroy (font_face);