removed the set_unicode_charmap() call. Made

2003-11-18  Sven Neumann  <sven@gimp.org>

	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex()
	rather than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
	encodings supported by fontconfig and fixes bug #101856.

6 files changed, 51 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 25bd02d8..fa1117a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-18  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
+	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex() rather
+	than than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
+	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
+	encodings supported by fontconfig and fixes bug #101856.
+
 Sat Nov 15 16:03:30 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 1.3.1 ===
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 25bd02d8..fa1117a0 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+2003-11-18  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
+	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex() rather
+	than than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
+	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
+	encodings supported by fontconfig and fixes bug #101856.
+
 Sat Nov 15 16:03:30 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 1.3.1 ===
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 25bd02d8..fa1117a0 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+2003-11-18  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
+	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex() rather
+	than than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
+	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
+	encodings supported by fontconfig and fixes bug #101856.
+
 Sat Nov 15 16:03:30 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 1.3.1 ===
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 25bd02d8..fa1117a0 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+2003-11-18  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
+	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex() rather
+	than than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
+	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
+	encodings supported by fontconfig and fixes bug #101856.
+
 Sat Nov 15 16:03:30 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 1.3.1 ===
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 25bd02d8..fa1117a0 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+2003-11-18  Sven Neumann  <sven@gimp.org>
+
+	* pango/pangoft2-fontmap.c: removed the set_unicode_charmap() call.
+	Made pango_ft2_font_real_get_glyph() use FcFreeTypeCharIndex() rather
+	than than FT_Get_Char_Index(). Made pango_ft2_font_real_has_char()
+	use FcCharSetHasChar().  This allows to use PangoFT2 with all font
+	encodings supported by fontconfig and fixes bug #101856.
+
 Sat Nov 15 16:03:30 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 1.3.1 ===
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index 7efe0287..3460eee8 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -68,6 +68,7 @@ struct _PangoFT2FontMapClass
 };
 
 static void          pango_ft2_font_map_class_init          (PangoFT2FontMapClass *class);
+static void          pango_ft2_font_map_init                (PangoFT2FontMap      *fontmap);
 static void          pango_ft2_font_map_finalize            (GObject              *object);
 static void          pango_ft2_font_map_default_substitute  (PangoFcFontMap       *fcfontmap,
 							     FcPattern            *pattern);
@@ -95,9 +96,9 @@ pango_ft2_font_map_get_type (void)
         NULL,           /* class_data */
         sizeof (PangoFT2FontMap),
         0,              /* n_preallocs */
-        (GInstanceInitFunc) NULL,
+        (GInstanceInitFunc) pango_ft2_font_map_init,
       };
-      
+
       object_type = g_type_register_static (PANGO_TYPE_FC_FONT_MAP,
                                             "PangoFT2FontMap",
                                             &object_info, 0);
@@ -120,6 +121,14 @@ pango_ft2_font_map_class_init (PangoFT2FontMapClass *class)
 }
 
 static void
+pango_ft2_font_map_init (PangoFT2FontMap *fontmap)
+{
+  fontmap->library = NULL;
+  fontmap->dpi_x   = 72.0;
+  fontmap->dpi_y   = 72.0;
+}
+
+static void
 pango_ft2_font_map_finalize (GObject *object)
 {
   PangoFT2FontMap *ft2fontmap = PANGO_FT2_FONT_MAP (object);