* util/grub-mkfont.c (main): Handle errors from FT_Set_Pixel_Sizes.

diff --git a/ChangeLog b/ChangeLog
index bc5e26582a1f3280b316e1e8911895a1aeecf2e1..1012833a0f981cb653ea87f23059986020ccb604 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
        editor under argument scope.
        Reported by: Jordan Uggla
 
+2010-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mkfont.c (main): Handle errors from FT_Set_Pixel_Sizes.
+
 2010-12-18  Colin Watson  <cjwatson@ubuntu.com>
 
        * grub-core/normal/term.c (print_more): Make \r or \n scroll one

diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 3e24380d167364a5bca9dfd43f23564ff368a6c1..fff6a619e6d4b7e2650b26b3c965a4799457331f 100644 (file)
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -1170,7 +1170,8 @@ main (int argc, char *argv[])
       font_info.style = ft_face->style_flags;
       font_info.size = size;
 
-      FT_Set_Pixel_Sizes (ft_face, size, size);
+      if (FT_Set_Pixel_Sizes (ft_face, size, size))
+       grub_util_error ("can't set %dx%d font size", size, size);
       add_font (&font_info, ft_face, file_format != PF2);
       FT_Done_Face (ft_face);
     }