From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 23 Sep 2012 08:28:12 +0000 (+0200)
Subject: * nsterm.m (ns_dumpglyphs_image): dr is a new rect to draw image into,
X-Git-Tag: emacs-24.2.90~244^2~132
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f4635e97e1587c4026ec83fc1bd9f8954775915;p=emacs.git

* nsterm.m (ns_dumpglyphs_image): dr is a new rect to draw image into,
background rect may be larger.

Fixes: debbugs:12445
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b60027880fe..ee3befaa9ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-23  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* 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  <cyd@gnu.org>
 
 	* keyboard.c (timer_check): Avoid quitting during Fcopy_sequence.
diff --git a/src/nsterm.m b/src/nsterm.m
index aa869e3ff44..a31b0127d89 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