From: Patrick Lam <plam@MIT.EDU>
Date: Tue, 7 Feb 2006 20:56:48 +0000 (+0000)
Subject: src/fccharset.c (FcLangCharSetPopulate, FcCharSetInsertLeaf)
X-Git-Tag: fc-2_3_94~31
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6cc02fe6b95421f6e97af9008ad9ff4febe80c36;p=fontconfig.git

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 c602061..69618f8 100644
--- 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 85b3947..e42b82d 100644
--- 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 *