summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-07-10 21:51:46 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-07-10 21:51:46 +0000
commit3a1b19f5e7106d1672ad0772a5800514726a7adc (patch)
treee95e291c13c7590ca412165831e37b26197a2c49
parent0835f598fcfbf6667a4be9cd9e7f6f16663dcb6a (diff)
downloadpango-3a1b19f5e7106d1672ad0772a5800514726a7adc.tar.gz
Add _pango prefix for _pango_ft2_font_get_cache_glyph_data and friends
Sat Jul 10 17:45:05 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-private.h: Add _pango prefix for _pango_ft2_font_get_cache_glyph_data and friends defined only in private header file.
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/pangoft2-private.h14
-rw-r--r--pango/pangoft2.c20
6 files changed, 41 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 84b5fee9..f0cfbf5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 10 17:45:05 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoft2-private.h: Add _pango prefix for
+ _pango_ft2_font_get_cache_glyph_data and friends
+ defined only in private header file.
+
Sat Jul 10 17:33:38 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2-private.h pango/pangoft2-render.c
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 84b5fee9..f0cfbf5a 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Sat Jul 10 17:45:05 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoft2-private.h: Add _pango prefix for
+ _pango_ft2_font_get_cache_glyph_data and friends
+ defined only in private header file.
+
Sat Jul 10 17:33:38 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2-private.h pango/pangoft2-render.c
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 84b5fee9..f0cfbf5a 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Sat Jul 10 17:45:05 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoft2-private.h: Add _pango prefix for
+ _pango_ft2_font_get_cache_glyph_data and friends
+ defined only in private header file.
+
Sat Jul 10 17:33:38 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2-private.h pango/pangoft2-render.c
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 84b5fee9..f0cfbf5a 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Sat Jul 10 17:45:05 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoft2-private.h: Add _pango prefix for
+ _pango_ft2_font_get_cache_glyph_data and friends
+ defined only in private header file.
+
Sat Jul 10 17:33:38 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2-private.h pango/pangoft2-render.c
diff --git a/pango/pangoft2-private.h b/pango/pangoft2-private.h
index 76735416..6011fec2 100644
--- a/pango/pangoft2-private.h
+++ b/pango/pangoft2-private.h
@@ -90,13 +90,13 @@ PangoFT2Font * _pango_ft2_font_new (PangoFT2FontMap *ft2fontmap
FT_Library _pango_ft2_font_map_get_library (PangoFontMap *fontmap);
const char *_pango_ft2_ft_strerror (FT_Error error);
-void *pango_ft2_font_get_cache_glyph_data (PangoFont *font,
- int glyph_index);
-void pango_ft2_font_set_cache_glyph_data (PangoFont *font,
- int glyph_index,
- void *cached_glyph);
-void pango_ft2_font_set_glyph_cache_destroy (PangoFont *font,
- GDestroyNotify destroy_notify);
+void *_pango_ft2_font_get_cache_glyph_data (PangoFont *font,
+ int glyph_index);
+void _pango_ft2_font_set_cache_glyph_data (PangoFont *font,
+ int glyph_index,
+ void *cached_glyph);
+void _pango_ft2_font_set_glyph_cache_destroy (PangoFont *font,
+ GDestroyNotify destroy_notify);
void _pango_ft2_draw_rect (FT_Bitmap *bitmap,
const PangoMatrix *matrix,
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 98228282..3578bf4e 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -385,8 +385,8 @@ pango_ft2_render_transformed (FT_Bitmap *bitmap,
PangoFT2RenderedGlyph *rendered_glyph;
glyph_index = gi->glyph;
- rendered_glyph = pango_ft2_font_get_cache_glyph_data (font,
- glyph_index);
+ rendered_glyph = _pango_ft2_font_get_cache_glyph_data (font,
+ glyph_index);
add_glyph_to_cache = FALSE;
if (rendered_glyph == NULL)
{
@@ -491,10 +491,10 @@ pango_ft2_render_transformed (FT_Bitmap *bitmap,
if (add_glyph_to_cache)
{
- pango_ft2_font_set_glyph_cache_destroy (font,
- (GDestroyNotify) pango_ft2_free_rendered_glyph);
- pango_ft2_font_set_cache_glyph_data (font,
- glyph_index, rendered_glyph);
+ _pango_ft2_font_set_glyph_cache_destroy (font,
+ (GDestroyNotify) pango_ft2_free_rendered_glyph);
+ _pango_ft2_font_set_cache_glyph_data (font,
+ glyph_index, rendered_glyph);
}
}
@@ -1064,7 +1064,7 @@ _pango_ft2_ft_strerror (FT_Error error)
void *
-pango_ft2_font_get_cache_glyph_data (PangoFont *font,
+_pango_ft2_font_get_cache_glyph_data (PangoFont *font,
int glyph_index)
{
PangoFT2GlyphInfo *info;
@@ -1080,7 +1080,7 @@ pango_ft2_font_get_cache_glyph_data (PangoFont *font,
}
void
-pango_ft2_font_set_cache_glyph_data (PangoFont *font,
+_pango_ft2_font_set_cache_glyph_data (PangoFont *font,
int glyph_index,
void *cached_glyph)
{
@@ -1096,8 +1096,8 @@ pango_ft2_font_set_cache_glyph_data (PangoFont *font,
}
void
-pango_ft2_font_set_glyph_cache_destroy (PangoFont *font,
- GDestroyNotify destroy_notify)
+_pango_ft2_font_set_glyph_cache_destroy (PangoFont *font,
+ GDestroyNotify destroy_notify)
{
g_return_if_fail (PANGO_FT2_IS_FONT (font));