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

493b5b1c · Jan Djärv · 817330b5 · 493b5b1c · 493b5b1c
Commit 493b5b1c authored Oct 07, 2012 by Jan Djärv
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

src/ChangeLog src/ChangeLog +2 -1

src/nsterm.m src/nsterm.m +3 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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.

--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2975,8 +2975,10 @@ Function modeled after x_draw_glyph_string_box ().
    {
 #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