5095888 libfreetype/libfontconfig should access name table with using UCS2/UTF-16BE
authorJay Hobson <Jay.Hobson@Sun.COM>
Tue, 06 Jun 2006 15:06:21 -0700
changeset 27 87081465ab5f
parent 26 3085f9d3b644
child 28 d7de7f091eb4
5095888 libfreetype/libfontconfig should access name table with using UCS2/UTF-16BE
open-src/lib/fontconfig/fontconfig-2.3.2.patch
open-src/lib/freetype/freetype-2.1.10.patch
--- a/open-src/lib/fontconfig/fontconfig-2.3.2.patch	Fri Jun 09 16:53:10 2006 -0700
+++ b/open-src/lib/fontconfig/fontconfig-2.3.2.patch	Tue Jun 06 15:06:21 2006 -0700
@@ -294,3 +294,14 @@
  
  uninstall-local:
  	if [ -f $(srcdir)/fonts.conf ]; then \
+--- src/fcfreetype.c.orig   Wed May 31 09:37:18 2006
++++ src/fcfreetype.c        Wed May 31 09:38:03 2006
+@@ -129,7 +129,7 @@
+  {  TT_PLATFORM_MICROSOFT,	TT_MS_ID_BIG_5,		"BIG-5" },
+  {  TT_PLATFORM_MICROSOFT,	TT_MS_ID_WANSUNG,	"Wansung" },
+  {  TT_PLATFORM_MICROSOFT,	TT_MS_ID_JOHAB,		"Johab" },
+- {  TT_PLATFORM_MICROSOFT,	TT_MS_ID_UCS_4,		"UCS4" },
++ {  TT_PLATFORM_MICROSOFT,	TT_MS_ID_UCS_4,		"UTF-16BE" },
+  {  TT_PLATFORM_ISO,		TT_ISO_ID_7BIT_ASCII,	"ASCII" },
+  {  TT_PLATFORM_ISO,		TT_ISO_ID_10646,	"UCS-2BE" },
+  {  TT_PLATFORM_ISO,		TT_ISO_ID_8859_1,	"ISO-8859-1" },
--- a/open-src/lib/freetype/freetype-2.1.10.patch	Fri Jun 09 16:53:10 2006 -0700
+++ b/open-src/lib/freetype/freetype-2.1.10.patch	Tue Jun 06 15:06:21 2006 -0700
@@ -95,3 +95,21 @@
      }
      else
      {
+--- src/sfnt/sfobjs.c       Wed May 31 09:40:31 2006
++++ src/sfnt/sfobjs.c       Wed May 31 09:41:08 2006
+@@ -236,13 +236,10 @@
+       {
+       case TT_MS_ID_UNICODE_CS:
+       case TT_MS_ID_SYMBOL_CS:
++      case TT_MS_ID_UCS_4:
+         convert = tt_name_entry_ascii_from_utf16;
+         break;
+
+-      case TT_MS_ID_UCS_4:
+-        convert = tt_name_entry_ascii_from_ucs4;
+-        break;
+-
+       default:
+         ;
+       }
+