* nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506).

diff --git a/src/ChangeLog b/src/ChangeLog
index 45e3c8a8a57417de970f4e68518e10b76fd22eba..492b966a256e3cae2471d7472206f52d2bf3e9fb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,10 @@
 2012-10-07  Jan Djärv  <jan.h.d@swipnet.se>
 
+       * 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 d6689c08aa2cdff8c33ee2e3ff7fef3119e8f328..6b739befeeb6265394c04314f96159ab80b63712 100644 (file)
--- 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