summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-09-20 08:23:20 +0000
committerTor Lillqvist <tml@novell.com>2005-09-20 08:23:20 +0000
commit4974affc3f64cb1d1f0ef270051e9415e643cfaa (patch)
treea82c820e199bf2aea2b064b39a0291e9cf1d5ff7
parente54787b78d414d1f0ec5c139ac3c29904a5e3610 (diff)
Pass scratch space instead of NULL for image_extra to acquire/release_dest_image.
-rw-r--r--ChangeLog6
-rw-r--r--src/cairo-atsui-font.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c0c1c6703..adf242d85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-20 T Rowley <tim.rowley@gmail.com>
+
+ * src/cairo-atsui-font.c (_cairo_atsui_font_show_glyphs):
+ Pass scratch space instead of NULL for image_extra to
+ acquire/release_dest_image.
+
2005-09-19 Carl Worth <cworth@cworth.org>
* src/cairo-xlib-surface.c: (_create_a8_picture): Avoid attempting
diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c
index 69e375290..84b7ea19a 100644
--- a/src/cairo-atsui-font.c
+++ b/src/cairo-atsui-font.c
@@ -461,13 +461,14 @@ _cairo_atsui_font_show_glyphs(void *abstract_font,
CGColorSpaceRef colorSpace;
cairo_image_surface_t *destImageSurface;
int i;
+ void *extra = NULL;
cairo_rectangle_t rect = {dest_x, dest_y, width, height};
_cairo_surface_acquire_dest_image(generic_surface,
&rect,
&destImageSurface,
&rect,
- NULL);
+ &extra);
// Create a CGBitmapContext for the dest surface for drawing into
colorSpace = CGColorSpaceCreateDeviceRGB();
@@ -531,7 +532,7 @@ _cairo_atsui_font_show_glyphs(void *abstract_font,
&rect,
destImageSurface,
&rect,
- NULL);
+ extra);
return CAIRO_STATUS_SUCCESS;
}