summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-1-107
-rw-r--r--ChangeLog.pre-1-67
-rw-r--r--ChangeLog.pre-1-87
-rw-r--r--pango/pangofc-font.c12
-rw-r--r--pango/pangofc-private.h10
-rw-r--r--pango/pangoft2.c8
-rw-r--r--pango/pangoxft-font.c12
8 files changed, 49 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 66e12ebe..b4842e21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jul 16 10:29:40 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangofc-font.c pango/pangofc-private.h
+ (pango_fc_font_get_raw_extents): Need to export this
+ function as a symbol if not in the header file since
+ it is used by PangoXft.
+
Fri Jul 16 07:43:04 2004 Owen Taylor <otaylor@redhat.com>
#143601: Felipe Heidrich
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 66e12ebe..b4842e21 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Fri Jul 16 10:29:40 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangofc-font.c pango/pangofc-private.h
+ (pango_fc_font_get_raw_extents): Need to export this
+ function as a symbol if not in the header file since
+ it is used by PangoXft.
+
Fri Jul 16 07:43:04 2004 Owen Taylor <otaylor@redhat.com>
#143601: Felipe Heidrich
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 66e12ebe..b4842e21 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Fri Jul 16 10:29:40 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangofc-font.c pango/pangofc-private.h
+ (pango_fc_font_get_raw_extents): Need to export this
+ function as a symbol if not in the header file since
+ it is used by PangoXft.
+
Fri Jul 16 07:43:04 2004 Owen Taylor <otaylor@redhat.com>
#143601: Felipe Heidrich
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 66e12ebe..b4842e21 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Fri Jul 16 10:29:40 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangofc-font.c pango/pangofc-private.h
+ (pango_fc_font_get_raw_extents): Need to export this
+ function as a symbol if not in the header file since
+ it is used by PangoXft.
+
Fri Jul 16 07:43:04 2004 Owen Taylor <otaylor@redhat.com>
#143601: Felipe Heidrich
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 7c373c2d..31851369 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -698,7 +698,7 @@ get_per_char (FT_Face face,
}
/**
- * _pango_fc_font_get_raw_extents:
+ * pango_fc_font_get_raw_extents:
* @fcfont: a #PangoFcFont
* @load_flags: flags to pass to FT_Load_Glyph()
* @glyph: the glyph index to load
@@ -716,11 +716,11 @@ get_per_char (FT_Face face,
* caching functionality similar to pango_ft2_font_set_glyph_info().
**/
void
-_pango_fc_font_get_raw_extents (PangoFcFont *fcfont,
- FT_Int32 load_flags,
- PangoGlyph glyph,
- PangoRectangle *ink_rect,
- PangoRectangle *logical_rect)
+pango_fc_font_get_raw_extents (PangoFcFont *fcfont,
+ FT_Int32 load_flags,
+ PangoGlyph glyph,
+ PangoRectangle *ink_rect,
+ PangoRectangle *logical_rect)
{
FT_Glyph_Metrics *gm;
FT_Face face;
diff --git a/pango/pangofc-private.h b/pango/pangofc-private.h
index a87b20a9..1b42ba16 100644
--- a/pango/pangofc-private.h
+++ b/pango/pangofc-private.h
@@ -39,11 +39,11 @@ PangoFcDecoder *_pango_fc_font_get_decoder (PangoFcFont *font);
void _pango_fc_font_set_decoder (PangoFcFont *font,
PangoFcDecoder *decoder);
-void _pango_fc_font_get_raw_extents (PangoFcFont *font,
- FT_Int32 load_flags,
- PangoGlyph glyph,
- PangoRectangle *ink_rect,
- PangoRectangle *logical_rect);
+void pango_fc_font_get_raw_extents (PangoFcFont *font,
+ FT_Int32 load_flags,
+ PangoGlyph glyph,
+ PangoRectangle *ink_rect,
+ PangoRectangle *logical_rect);
G_END_DECLS
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 3578bf4e..082b6725 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -537,10 +537,10 @@ pango_ft2_font_get_glyph_info (PangoFont *font,
{
info = g_new0 (PangoFT2GlyphInfo, 1);
- _pango_fc_font_get_raw_extents (fcfont, ft2font->load_flags,
- glyph,
- &info->ink_rect,
- &info->logical_rect);
+ pango_fc_font_get_raw_extents (fcfont, ft2font->load_flags,
+ glyph,
+ &info->ink_rect,
+ &info->logical_rect);
g_hash_table_insert (ft2font->glyph_info, GUINT_TO_POINTER(glyph), info);
}
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index cf32c1de..bff2c305 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -503,11 +503,11 @@ get_glyph_extents_raw (PangoXftFont *xfont,
{
extents = g_new (Extents, 1);
- _pango_fc_font_get_raw_extents (PANGO_FC_FONT (xfont),
- FT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING,
- glyph,
- &extents->ink_rect,
- &extents->logical_rect);
+ pango_fc_font_get_raw_extents (PANGO_FC_FONT (xfont),
+ FT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING,
+ glyph,
+ &extents->ink_rect,
+ &extents->logical_rect);
g_hash_table_insert (xfont->glyph_info,
GUINT_TO_POINTER (glyph),
@@ -651,7 +651,7 @@ pango_xft_font_real_get_glyph (PangoFcFont *font,
gunichar wc)
{
XftFont *xft_font = xft_font_get_font ((PangoFont *)font);
-
+
return XftCharIndex (NULL, xft_font, wc);
}