diff options
author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-24 23:39:25 -0700 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-24 23:41:26 -0700 |
commit | 301029c9a1d9429009eaf08bb726357d4e94780d (patch) | |
tree | 66963028918e6850c9506187f8542091638484fe | |
parent | 550b2f76401c292d982700b60326e0a837e391b4 (diff) | |
download | xorg-lib-libXft-301029c9a1d9429009eaf08bb726357d4e94780d.tar.gz |
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>
-rw-r--r-- | src/xftglyphs.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |