[Emacs-diffs] /srv/bzr/emacs/trunk r110418: * nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506).

[Jan D.]

------------------------------------------------------------
revno: 110418
fixes bug: http://debbugs.gnu.org/12506
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-07 13:09:04 +0200
message:
  * nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506).
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-07 10:07:23 +0000
+++ b/src/ChangeLog     2012-10-07 11:09:04 +0000
@@ -1,9 +1,10 @@
 2012-10-07  Jan Djärv  <address@hidden>
 
+       * 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.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-10-07 10:07:23 +0000
+++ b/src/nsterm.m      2012-10-07 11:09:04 +0000
@@ -2975,8 +2975,10 @@
     {
 #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