summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-07-15 18:57:14 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-07-15 18:57:14 +0000
commiteda1823df7f6c2d117964ab7ab2dcea7e99c3144 (patch)
treedccf5f916dbbdbeb982cc67cb55ced9a2f2aa6b2
parent1753306eec6eeeebf0964a9f94ae7f59fb10f7db (diff)
downloadpango-eda1823df7f6c2d117964ab7ab2dcea7e99c3144.tar.gz
pango/pangoft2.c (pango_ft2_get_per_char) Make load flags
Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c (pango_ft2_get_per_char) * pango/pangoft2.c (pango_ft2_font_render_glyph): Make load flags FT_LOAD_NO_BITMAP, since we can't handle bitmaps at the moment in our render functions.
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-1-107
-rw-r--r--ChangeLog.pre-1-27
-rw-r--r--ChangeLog.pre-1-47
-rw-r--r--ChangeLog.pre-1-67
-rw-r--r--ChangeLog.pre-1-87
-rw-r--r--pango/pangoft2.c4
7 files changed, 44 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a1a7596..8e612039 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoft2.c (pango_ft2_get_per_char)
+ * pango/pangoft2.c (pango_ft2_font_render_glyph):
+ Make load flags FT_LOAD_NO_BITMAP, since we can't
+ handle bitmaps at the moment in our render functions.
+
Wed Jul 3 18:39:45 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2.c pango/pangoxft-font.c: Be more
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 1a1a7596..8e612039 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoft2.c (pango_ft2_get_per_char)
+ * pango/pangoft2.c (pango_ft2_font_render_glyph):
+ Make load flags FT_LOAD_NO_BITMAP, since we can't
+ handle bitmaps at the moment in our render functions.
+
Wed Jul 3 18:39:45 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2.c pango/pangoxft-font.c: Be more
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 1a1a7596..8e612039 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoft2.c (pango_ft2_get_per_char)
+ * pango/pangoft2.c (pango_ft2_font_render_glyph):
+ Make load flags FT_LOAD_NO_BITMAP, since we can't
+ handle bitmaps at the moment in our render functions.
+
Wed Jul 3 18:39:45 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2.c pango/pangoxft-font.c: Be more
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 1a1a7596..8e612039 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoft2.c (pango_ft2_get_per_char)
+ * pango/pangoft2.c (pango_ft2_font_render_glyph):
+ Make load flags FT_LOAD_NO_BITMAP, since we can't
+ handle bitmaps at the moment in our render functions.
+
Wed Jul 3 18:39:45 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2.c pango/pangoxft-font.c: Be more
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 1a1a7596..8e612039 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoft2.c (pango_ft2_get_per_char)
+ * pango/pangoft2.c (pango_ft2_font_render_glyph):
+ Make load flags FT_LOAD_NO_BITMAP, since we can't
+ handle bitmaps at the moment in our render functions.
+
Wed Jul 3 18:39:45 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2.c pango/pangoxft-font.c: Be more
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 1a1a7596..8e612039 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoft2.c (pango_ft2_get_per_char)
+ * pango/pangoft2.c (pango_ft2_font_render_glyph):
+ Make load flags FT_LOAD_NO_BITMAP, since we can't
+ handle bitmaps at the moment in our render functions.
+
Wed Jul 3 18:39:45 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2.c pango/pangoxft-font.c: Be more
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 8eaeda57..051d0012 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -370,7 +370,7 @@ pango_ft2_font_render_glyph (PangoFont *font,
{
/* Draw glyph */
/* FIXME hint or not? */
- FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT);
+ FT_Load_Glyph (face, glyph_index, FT_LOAD_NO_BITMAP);
FT_Render_Glyph (face->glyph, ft_render_mode_normal);
rendered->bitmap = face->glyph->bitmap;
@@ -514,7 +514,7 @@ static FT_Glyph_Metrics *
pango_ft2_get_per_char (FT_Face face,
guint32 glyph_index)
{
- FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT);
+ FT_Load_Glyph (face, glyph_index, FT_LOAD_NO_BITMAP);
return &face->glyph->metrics;
}