src/fccharset.c (FcLangCharSetPopulate, FcCharSetInsertLeaf)

Fix missing FcCacheBankToIndex in FcCharSetInsertLeaf. Declare extern for
    static arrays as arrays, not pointers. (Part of the fix for 'fonts
    don't have en' issue after Euro patch.)
(I forgot to commit the ChangeLog last time.)
reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index c60206120bf537d8c26f7a806ca142ebe7452cc4..69618f8e6607cb2902a4b3839060e00552a83b96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2006-02-07  Takashi Iwai  <tiwai@suse.de>
+       reviewed by: plam
+
+       * src/fccharset.c (FcLangCharSetPopulate, FcCharSetInsertLeaf)
+       * fc-lang/fc-lang.c:
+
+       Fix missing FcCacheBankToIndex in FcCharSetInsertLeaf.
+       Declare extern for static arrays as arrays, not pointers.
+       (Part of the fix for 'fonts don't have en' issue after Euro patch.)
+
+2006-02-07  Dirk Mueller  <dmueller@suse.com>
+       reviewed by: plam
+
+       * fc-lang/de.orth:
+       * fc-lang/el.orth:
+       * fc-lang/en.orth:
+       * fc-lang/es.orth:
+       * fc-lang/fi.orth:
+       * fc-lang/fr.orth:
+       * fc-lang/it.orth:
+       * fc-lang/nl.orth:
+       * fc-lang/pt.orth:
+
+       Add Euro sign to list of symbols required by European languages.
+
 2006-02-07  Patrick Lam  <plam@mit.edu>
        * src/fccache.c (FcCacheReadString):
 

diff --git a/src/fccharset.c b/src/fccharset.c
index 85b394743ad2c59b42eb8d3b16cdfc65df80b3f4..e42b82d329359743aaa6d7a5a53e79be85f124e0 100644 (file)
--- a/src/fccharset.c
+++ b/src/fccharset.c
@@ -51,9 +51,9 @@ FcLangCharSetPopulate (void)
     int bi = FcCacheBankToIndexMTF (FC_BANK_LANGS);
     FcCharSetEnsureBank (bi);
     charsets[bi] = 0;
-    numbers[bi] = (FcChar16 *)&langBankNumbers;
-    leaves[bi] = (FcCharLeaf *)&langBankLeaves;
-    leaf_idx[bi] = (int *)&langBankLeafIdx;
+    numbers[bi] = (FcChar16 *)langBankNumbers;
+    leaves[bi] = (FcCharLeaf *)langBankLeaves;
+    leaf_idx[bi] = (int *)langBankLeafIdx;
 }
 
 FcCharSet *