From: Po Lu <luangruo@yahoo.com>
Date: Sat, 5 Feb 2022 03:20:45 +0000 (+0000)
Subject: Fix last change to ftcrfont.c
X-Git-Tag: emacs-29.0.90~2519
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c66aee17800077a7911972fe402f2ff870b9cec;p=emacs.git

Fix last change to ftcrfont.c

* src/ftcrfont.c (ftcrfont_draw): Remove relic `face' variable
and use s->face instead.
---

diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 87a8692a3b8..a0a3490c494 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -571,8 +571,6 @@ ftcrfont_draw (struct glyph_string *s,
       pgtk_set_cr_source_with_color (f, s->xgcv.background, true);
 #endif
 #else
-      struct face *face = s->face;
-
       uint32_t col = be_background;
 
       cairo_set_source_rgb (cr, RED_FROM_ULONG (col) / 255.0,
@@ -580,8 +578,8 @@ ftcrfont_draw (struct glyph_string *s,
 			    BLUE_FROM_ULONG (col) / 255.0);
 #endif
       s->background_filled_p = 1;
-      cairo_rectangle (cr, x, y - FONT_BASE (face->font),
-		       s->width, FONT_HEIGHT (face->font));
+      cairo_rectangle (cr, x, y - FONT_BASE (s->font),
+		       s->width, FONT_HEIGHT (s->font));
       cairo_fill (cr);
     }