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

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-18 22:47:50 +01:00
parent 30aff4cb3a
commit 5cf86f4b0f
2 changed files with 6 additions and 1 deletions

View file

@ -4,6 +4,10 @@
editor under argument scope. editor under argument scope.
Reported by: Jordan Uggla 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> 2010-12-18 Colin Watson <cjwatson@ubuntu.com>
* grub-core/normal/term.c (print_more): Make \r or \n scroll one * grub-core/normal/term.c (print_more): Make \r or \n scroll one

View file

@ -1170,7 +1170,8 @@ main (int argc, char *argv[])
font_info.style = ft_face->style_flags; font_info.style = ft_face->style_flags;
font_info.size = size; 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); add_font (&font_info, ft_face, file_format != PF2);
FT_Done_Face (ft_face); FT_Done_Face (ft_face);
} }