From 30fd7198fecf192f816aa9d33ff63b87b3895c70 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 27 Oct 2013 20:38:32 +0100 Subject: [PATCH] * util/grub-mkfont.c (main): Show error message when FT_Set_Pixel_Sizes fails. --- ChangeLog | 5 +++++ util/grub-mkfont.c | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d3e25bdc..302d3d8eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-27 Vladimir Serbinenko + + * util/grub-mkfont.c (main): Show error message when FT_Set_Pixel_Sizes + fails. + 2013-10-27 BVK Chaitanya * docs/autoiso.cfg: New file. diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c index e1f155282..66385fd26 100644 --- a/util/grub-mkfont.c +++ b/util/grub-mkfont.c @@ -1221,9 +1221,13 @@ main (int argc, char *argv[]) arguments.font_info.style = ft_face->style_flags; arguments.font_info.size = size; - if (FT_Set_Pixel_Sizes (ft_face, size, size)) - grub_util_error (_("can't set %dx%d font size"), - size, size); + err = FT_Set_Pixel_Sizes (ft_face, size, size); + + if (err) + grub_util_error (_("can't set %dx%d font size: Freetype error %d: %s"), + size, size, err, + (err > 0 && err < (signed) ARRAY_SIZE (ft_errmsgs)) + ? ft_errmsgs[err] : ""); add_font (&arguments.font_info, ft_face, arguments.file_format != PF2); FT_Done_Face (ft_face); }