harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r572707 - /harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c
Date Tue, 04 Sep 2007 15:19:12 GMT
Author: ayza
Date: Tue Sep  4 08:19:11 2007
New Revision: 572707

URL: http://svn.apache.org/viewvc?rev=572707&view=rev
Log:
Applying patch from HARMONY-4641 ([classlib][awt][font] Harmony has problem with some fonts
in Fedora)

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c?rev=572707&r1=572706&r2=572707&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c
Tue Sep  4 08:19:11 2007
@@ -404,12 +404,11 @@
     /* defining font type */
     face = XftLockFace(xftFnt);
     if ((face->face_flags & FT_FACE_FLAG_SCALABLE) &&
-            !(face->face_flags & FT_FACE_FLAG_FIXED_SIZES)){
-        if (face->face_flags & FT_FACE_FLAG_SFNT){
-            font_type = FONT_TYPE_TT;
-        } else {
+            !(face->face_flags & FT_FACE_FLAG_FIXED_SIZES) &&
+            !(face->face_flags & FT_FACE_FLAG_SFNT)) {
             font_type = FONT_TYPE_T1;
-        }
+    } else {
+        font_type = FONT_TYPE_TT;
     }
     XftUnlockFace(xftFnt);
 



Mime
View raw message