From 8f4635e97e1587c4026ec83fc1bd9f8954775915 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sun, 23 Sep 2012 10:28:12 +0200 Subject: [PATCH] * nsterm.m (ns_dumpglyphs_image): dr is a new rect to draw image into, background rect may be larger. Fixes: debbugs:12445 --- src/ChangeLog | 5 +++++ src/nsterm.m | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index b60027880f..ee3befaa9b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-09-23 Jan Djärv + + * nsterm.m (ns_dumpglyphs_image): dr is a new rect to draw image into, + background rect may be larger (Bug#12445). + 2012-09-23 Chong Yidong * keyboard.c (timer_check): Avoid quitting during Fcopy_sequence. diff --git a/src/nsterm.m b/src/nsterm.m index aa869e3ff4..a31b0127d8 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2979,7 +2979,8 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) if (img != nil) { #if !defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 - [img drawInRect: br + NSRect dr = NSMakeRect (x, y, s->slice.width, s->slice.height); + [img drawInRect: dr fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 -- 2.20.1