[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 src/fcfreetype.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7575c666619c58df00659d4e70b01104b8e114a5
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jul 25 16:38:52 2009 -0400

    TT_MS_ID_UCS_4 is really UTF-16BE, not UTF-32
    
    Reported by Yuriy Kaminskiy.

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index f721243..b678f26 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -124,7 +124,7 @@ static const FcFtEncoding   fcFtEncoding[] = {
  {  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,		"UCS-2BE" },
  {  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" },