From 301029c9a1d9429009eaf08bb726357d4e94780d Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon, 24 Oct 2011 23:39:25 -0700
Subject: Fix undefined ftbit in XftFontLoadGlyphs

https://bugs.freedesktop.org/show_bug.cgi?id=42173

Fixes regression from: 6f1d7bcdd461b1f6cc64370793f52d7c170187d0

Fixed by examining original patch before rebase from:
https://bugs.freedesktop.org/show_bug.cgi?id=29151

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
 src/xftglyphs.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/xftglyphs.c b/src/xftglyphs.c
index 2639d12..4a3b9d6 100644
--- a/src/xftglyphs.c
+++ b/src/xftglyphs.c
@@ -570,6 +570,9 @@ XftFontLoadGlyphs (Display	    *dpy,
 	    xftg->metrics.yOff = -TRUNC(ROUND(glyphslot->advance.y));
 	}
 
+	// compute the size of the final bitmap
+	ftbit = &glyphslot->bitmap;
+
 	width = ftbit->width;
 	height = ftbit->rows;
 
-- 
cgit v1.2.1