From b51e5112fa1576febb050ab6abd092c032671640 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 19 Nov 2007 05:02:49 +0000 Subject: [PATCH] (ftfont_get_bitmap): Set bitmap->bits_per_pixel. --- src/ftfont.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/ftfont.c b/src/ftfont.c index 7edf7f142b6..e8ef6a4871f 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -913,6 +913,15 @@ ftfont_get_bitmap (font, code, bitmap, bits_per_pixel) if (FT_Load_Glyph (ft_face, code, load_flags) != 0) return -1; + bitmap->bits_per_pixel + = (ft_face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO ? 1 + : ft_face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY ? 8 + : ft_face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_LCD ? 8 + : ft_face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_LCD_V ? 8 + : -1); + if (bitmap->bits_per_pixel < 0) + /* We don't suport that kind of pixel mode. */ + return -1; bitmap->rows = ft_face->glyph->bitmap.rows; bitmap->width = ft_face->glyph->bitmap.width; bitmap->pitch = ft_face->glyph->bitmap.pitch; -- 2.39.5