From 09eb9aa351a67b24de59cf0cdf33b8c61210d91e Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Sat, 21 Mar 2026 17:09:30 -0700 Subject: [PATCH] rootless: Fix Glyphs damage bounding box to correctly compute union RootlessGlyphs used max() for box.x1 and box.y1 when accumulating the bounding box across glyphs in a list. Computing the union of bounding boxes requires min() for the lower coordinate corner and max for the higher coordinate corner. Signed-off-by: Jeremy Huddleston Sequoia (cherry picked from commit e8936920ee392086f3af42d86f533bafe589fdb2) --- miext/rootless/rootlessScreen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 79fe3507b..0cf0eda61 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -332,8 +332,8 @@ RootlessGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, x2 = x1 + glyph->info.width; y2 = y1 + glyph->info.height; - box.x1 = max(box.x1, x1); - box.y1 = max(box.y1, y1); + box.x1 = min(box.x1, x1); + box.y1 = min(box.y1, y1); box.x2 = max(box.x2, x2); box.y2 = max(box.y2, y2);