From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 18 Jun 2004 12:36:14 +0000 (+0000)
Subject: (pango_fc_afm_get_glyph)
X-Git-Tag: release/2.2.3~1^2~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a40b9e7ae7344a4d9fa82a4944e99bbc2a757013;p=lilypond.git

(pango_fc_afm_get_glyph)
(pango_fc_afm_get_charset): Update iaw Pango CVS update.
---

diff --git a/ChangeLog b/ChangeLog
index 33da397b4c..d6b30756da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-06-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* lily/pangofc-afm-decoder.cc (pango_fc_afm_get_glyph) 
+	(pango_fc_afm_get_charset): Update iaw Pango CVS update.
+
 	* buildscripts/guile-gnome.sh: Add pango to recipe.  Resolve
 	conflict.  Have I told you lately how much I love autotools?
 
diff --git a/lily/pangofc-afm-decoder.cc b/lily/pangofc-afm-decoder.cc
index c7e2ef1aac..c6a587c5ca 100644
--- a/lily/pangofc-afm-decoder.cc
+++ b/lily/pangofc-afm-decoder.cc
@@ -56,9 +56,12 @@ static void pango_fc_afm_decoder_init (PangoFcAfmDecoder *fontmap);
 static void pango_fc_afm_decoder_class_init (PangoFcAfmDecoderClass *clss);
 static void pango_fc_afm_decoder_finalize (GObject *object);
 
-static FcCharSet *pango_fc_afm_get_charset (PangoFcFont *fcfont);
-static PangoGlyph pango_fc_afm_get_glyph (PangoFcFont *fcfont, guint32 wc);
-static void pango_fc_afm_decoder_set_file_name (PangoFcAfmDecoder *self, char const *file_name);
+static FcCharSet *pango_fc_afm_get_charset (PangoFcDecoder *decoder,
+					    PangoFcFont *fcfont);
+static PangoGlyph pango_fc_afm_get_glyph (PangoFcDecoder *decoder,
+					  PangoFcFont *fcfont, guint32 wc);
+static void pango_fc_afm_decoder_set_file_name (PangoFcAfmDecoder *self,
+						char const *file_name);
 
 static PangoFcDecoderClass *parent_class;
 
@@ -136,8 +139,9 @@ pango_fc_afm_decoder_finalize (GObject *object)
 }
 
 static FcCharSet *
-pango_fc_afm_get_charset (PangoFcFont *fcfont)
+pango_fc_afm_get_charset (PangoFcDecoder *decoder, PangoFcFont *fcfont)
 {
+  (void) decoder;
   //dprintf ("get charset: %s\n", fcfont->font_pattern);
   dprintf ("get charset: \n");
 #if 0  
@@ -161,8 +165,10 @@ pango_fc_afm_get_charset (PangoFcFont *fcfont)
 }
 
 static PangoGlyph
-pango_fc_afm_get_glyph (PangoFcFont *fcfont, guint32 wc)
+pango_fc_afm_get_glyph (PangoFcDecoder *decoder, PangoFcFont *fcfont,
+			guint32 wc)
 {
+  (void) decoder;
 #if 0
   XftFont *xft_font;
   xft_font = XftFontOpenPattern (GDK_DISPLAY (),