You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2007/07/18 14:36:38 UTC
svn commit: r557241 -
/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp
Author: apetrenko
Date: Wed Jul 18 05:36:37 2007
New Revision: 557241
URL: http://svn.apache.org/viewvc?view=rev&rev=557241
Log:
Patch for HARMONY-4492 "[classlib][awt] Fontlib can not load style info from DejaVu fonts"
Modified:
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp?view=diff&rev=557241&r1=557240&r2=557241
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp Wed Jul 18 05:36:37 2007
@@ -377,21 +377,10 @@
}
subFamilyName[j] = 0;
-//#ifdef WIN32
-
-#define COMPARE_IT (!fwcscmp((ufshort *)subFamilyName,"Italic"))
+#define COMPARE_IT (!fwcscmp((ufshort *)subFamilyName,"Italic") || !fwcscmp((ufshort *)subFamilyName,"Oblique"))
#define COMPARE_BD (!fwcscmp((ufshort *)subFamilyName,"Bold"))
-#define COMPARE_BDIT (!fwcscmp((ufshort *)subFamilyName,"Bold Italic"))
-#define COMPARE_REG (!fwcscmp((ufshort *)subFamilyName,"Regular") || !fwcscmp((fwchar_t *)subFamilyName,"Normal"))
-
-/*#else
-
-#define COMPARE_IT (compare((fwchar_t *)subFamilyName, "Italic"))
-#define COMPARE_BD (compare((fwchar_t *)subFamilyName, "Bold"))
-#define COMPARE_BDIT (compare((fwchar_t *)subFamilyName, "Bold Italic"))
-#define COMPARE_REG (compare((fwchar_t *)subFamilyName, "Regular") || compare((fwchar_t *)subFamilyName, "Normal"))
-
-#endif*/
+#define COMPARE_BDIT (!fwcscmp((ufshort *)subFamilyName,"Bold Italic") || !fwcscmp((ufshort *)subFamilyName,"Bold Oblique"))
+#define COMPARE_REG (!fwcscmp((ufshort *)subFamilyName,"Regular") || !fwcscmp((fwchar_t *)subFamilyName,"Normal") || !fwcscmp((fwchar_t *)subFamilyName,"Book"))
if COMPARE_IT
{