[Emacs-diffs] emacs/src ftfont.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/04/06 07:56:47

Modified files:
        src            : ftfont.c 

Log message:
        (ftfont_open): Fix checking of the return value of
        FT_Load_Char.  Fix setting font->underline_thickness.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ftfont.c?cvsroot=emacs&r1=1.47&r2=1.48

Patches:
Index: ftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ftfont.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- ftfont.c    30 Mar 2009 05:38:51 -0000      1.47
+++ ftfont.c    6 Apr 2009 07:56:47 -0000       1.48
@@ -1130,7 +1130,7 @@
 
       font->min_width = font->average_width = font->space_width = 0;
       for (i = 32, n = 0; i < 127; i++)
-       if (FT_Load_Char (ft_face, i, FT_LOAD_DEFAULT) != 0)
+       if (FT_Load_Char (ft_face, i, FT_LOAD_DEFAULT) == 0)
          {
            int this_width = ft_face->glyph->metrics.horiAdvance >> 6;
 
@@ -1153,7 +1153,7 @@
   if (scalable)
     {
       font->underline_position = -ft_face->underline_position * size / upEM;
-      font->underline_thickness = -ft_face->underline_thickness * size / upEM;
+      font->underline_thickness = ft_face->underline_thickness * size / upEM;
     }
   else
     {