From: Jan Djärv Date: Sun, 7 Oct 2012 11:09:04 +0000 (+0200) Subject: * nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506). X-Git-Tag: emacs-24.2.90~239^2~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=493b5b1c4a7e8b27a0e57c596a83e8b4acad591c;p=emacs.git * nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506). --- diff --git a/src/ChangeLog b/src/ChangeLog index 45e3c8a8a57..492b966a256 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,9 +1,10 @@ 2012-10-07 Jan Djärv + * nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506). + * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of MAC_OS_X_VERSION_10_6. (syms_of_nsterm): Remove comment about Panther and above for ns-antialias-text. - * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove. (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4. (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3. diff --git a/src/nsterm.m b/src/nsterm.m index d6689c08aa2..6b739befeeb 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2975,8 +2975,10 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) { #if !defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 NSRect dr = NSMakeRect (x, y, s->slice.width, s->slice.height); + NSRect ir = NSMakeRect (s->slice.x, s->slice.y, + s->slice.width, s->slice.height); [img drawInRect: dr - fromRect: NSZeroRect + fromRect: ir operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES