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/11 11:19:14 UTC
svn commit: r555220 - in
/harmony/enhanced/classlib/trunk/modules/awt/src/main:
java/common/org/apache/harmony/awt/gl/font/FontManager.java
native/fontlib/shared/ParsingTables.cpp
native/fontlib/shared/TypeDefinition.cpp
Author: apetrenko
Date: Wed Jul 11 02:19:13 2007
New Revision: 555220
URL: http://svn.apache.org/viewvc?view=rev&rev=555220
Log:
Patch for HARMONY-4299 "[classlib][awt] Invalid font's style definition for TrueType fonts in fontlib"
Modified:
harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java?view=diff&rev=555220&r1=555219&r2=555220
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java Wed Jul 11 02:19:13 2007
@@ -52,7 +52,7 @@
*/
public String[] allFamilies;
- public static final String DEFAULT_NAME = IS_FONTLIB ? "Luxi Sans" : "Default"; /* Default font name */ //$NON-NLS-1$
+ public static final String DEFAULT_NAME = IS_FONTLIB ? "Courier" : "Default"; /* Default font name */ //$NON-NLS-1$
public static final String DIALOG_NAME = "Dialog"; /* Dialog font name */ //$NON-NLS-1$
/**
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=555220&r1=555219&r2=555220
==============================================================================
--- 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 11 02:19:13 2007
@@ -377,21 +377,21 @@
}
subFamilyName[j] = 0;
-/*#ifdef WIN32
+//#ifdef WIN32
-#define COMPARE_IT (!_wcsicmp((fwchar_t *)subFamilyName,L"Italic"))
-#define COMPARE_BD (!_wcsicmp((fwchar_t *)subFamilyName,L"Bold"))
-#define COMPARE_BDIT (!_wcsicmp((fwchar_t *)subFamilyName,L"Bold Italic"))
-#define COMPARE_REG (!_wcsicmp((fwchar_t *)subFamilyName,L"Regular") || !_wcsicmp((fwchar_t *)subFamilyName,L"Normal"))
+#define COMPARE_IT (!fwcscmp((fwchar_t *)subFamilyName,L"Italic"))
+#define COMPARE_BD (!fwcscmp((fwchar_t *)subFamilyName,L"Bold"))
+#define COMPARE_BDIT (!fwcscmp((fwchar_t *)subFamilyName,L"Bold Italic"))
+#define COMPARE_REG (!fwcscmp((fwchar_t *)subFamilyName,L"Regular") || !fwcscmp((fwchar_t *)subFamilyName,L"Normal"))
-#else*/
+/*#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
+#endif*/
if COMPARE_IT
{
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp?view=diff&rev=555220&r1=555219&r2=555220
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp Wed Jul 11 02:19:13 2007
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
#include "TypeDefinition.h"
fint fwcslen(fwchar_t* str)