summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2005-05-01 15:36:22 +0000
committerOwen Taylor <otaylor@src.gnome.org>2005-05-01 15:36:22 +0000
commit93fdbe64dcd1dab98cdd09545a43ac9329f11534 (patch)
tree55210f0ce76f3378ff789965faf1297f5560d7ed
parent3fc02e41c1efd23af4eb0e34af0fd6fa2783ead6 (diff)
downloadpango-93fdbe64dcd1dab98cdd09545a43ac9329f11534.tar.gz
Fix for the change of cairo_clip() not to preserve the path.
2005-05-01 Owen Taylor <otaylor@redhat.com> * examples/cairoview.c: Fix for the change of cairo_clip() not to preserve the path.
-rw-r--r--ChangeLog12
-rw-r--r--ChangeLog.pre-1-1012
-rw-r--r--examples/cairoview.c2
3 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cdf462a..fd4365e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-05-01 Owen Taylor <otaylor@redhat.com>
+
+ * examples/cairoview.c: Fix for the change of cairo_clip() not to preserve
+ the path.
+
+2005-04-29 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangocairo-fcfont.c (pango_cairo_fc_font_get_glyph_extents):
+ Get the ascent/descent from Cairo to fix bugs in metrics computation
+ with a transformation in effect.
+
2005-04-28 Tor Lillqvist <tml@novell.com>
* pango/pangocairo-win32font.c (pango_cairo_win32_font_get_font_face):
@@ -49,6 +60,7 @@ Mon Apr 18 15:49:36 2005 Manish Singh <yosh@gimp.org>
* examples/cairoview.c: Update to new Cairo API for setting color
and opacity.
+>>>>>>> 1.1097
2005-04-12 Tor Lillqvist <tml@novell.com>
* pango/opentype/Makefile.am: Rename LDADDS to
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3cdf462a..fd4365e1 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+2005-05-01 Owen Taylor <otaylor@redhat.com>
+
+ * examples/cairoview.c: Fix for the change of cairo_clip() not to preserve
+ the path.
+
+2005-04-29 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangocairo-fcfont.c (pango_cairo_fc_font_get_glyph_extents):
+ Get the ascent/descent from Cairo to fix bugs in metrics computation
+ with a transformation in effect.
+
2005-04-28 Tor Lillqvist <tml@novell.com>
* pango/pangocairo-win32font.c (pango_cairo_win32_font_get_font_face):
@@ -49,6 +60,7 @@ Mon Apr 18 15:49:36 2005 Manish Singh <yosh@gimp.org>
* examples/cairoview.c: Update to new Cairo API for setting color
and opacity.
+>>>>>>> 1.1097
2005-04-12 Tor Lillqvist <tml@novell.com>
* pango/opentype/Makefile.am: Rename LDADDS to
diff --git a/examples/cairoview.c b/examples/cairoview.c
index a805595b..96c39886 100644
--- a/examples/cairoview.c
+++ b/examples/cairoview.c
@@ -165,7 +165,7 @@ update ()
cairo_clip (cr);
cairo_set_rgb_color (cr, 1.0, 1.0, 1.0);
- cairo_fill (cr);
+ cairo_paint (cr);
/* Draw the text in black */
cairo_set_rgb_color (cr, 0.0, 0.0, 0.0);