* 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 b60027880fed0fdaf52c57c536176a5dc8fc4cf2..ee3befaa9ba8a575f32d3dfe998f3743fe61f062 100644 (file)
--- 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 aa869e3ff44a401bb784b7cd9dd65ae28448c1e3..a31b0127d89d88483e09fa52378098202f37d1ee 100644 (file)
--- 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