* util/grub-mkfont.c (main): Show error message when FT_Set_Pixel_Sizes

	fails.

diff --git a/ChangeLog b/ChangeLog
index 6d3e25bdc2650b0fc696ac29aac3cf4aed802f40..302d3d8eb03ead1d4f998b025a98f091851d2b44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mkfont.c (main): Show error message when FT_Set_Pixel_Sizes
+       fails.
+
 2013-10-27  BVK Chaitanya  <bvk.groups@gmail.com>
 
        * docs/autoiso.cfg: New file.

diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index e1f15528236cb92e4567a7654e1b08fd23e83df3..66385fd263d771019389faec5f7be8c019b0ed73 100644 (file)
--- 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);
       }