diff options
| author | Jan Djärv | 2012-10-07 13:09:04 +0200 |
|---|---|---|
| committer | Jan Djärv | 2012-10-07 13:09:04 +0200 |
| commit | 493b5b1c4a7e8b27a0e57c596a83e8b4acad591c (patch) | |
| tree | 2563eed0bc77cb8a6a85bacfd78a75ac7226639d /src | |
| parent | 817330b512a1453571c619e01114a02fd6d9aba9 (diff) | |
| download | emacs-493b5b1c4a7e8b27a0e57c596a83e8b4acad591c.tar.gz emacs-493b5b1c4a7e8b27a0e57c596a83e8b4acad591c.zip | |
* nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/nsterm.m | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 45e3c8a8a57..492b966a256 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | 2012-10-07 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2012-10-07 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * nsterm.m (ns_dumpglyphs_image): Only draw slize of image (Bug#12506). | ||
| 4 | |||
| 3 | * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of | 5 | * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of |
| 4 | MAC_OS_X_VERSION_10_6. | 6 | MAC_OS_X_VERSION_10_6. |
| 5 | (syms_of_nsterm): Remove comment about Panther and above for ns-antialias-text. | 7 | (syms_of_nsterm): Remove comment about Panther and above for ns-antialias-text. |
| 6 | |||
| 7 | * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove. | 8 | * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove. |
| 8 | (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4. | 9 | (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4. |
| 9 | (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3. | 10 | (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3. |
diff --git a/src/nsterm.m b/src/nsterm.m index d6689c08aa2..6b739befeeb 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -2975,8 +2975,10 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) | |||
| 2975 | { | 2975 | { |
| 2976 | #if !defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 | 2976 | #if !defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 |
| 2977 | NSRect dr = NSMakeRect (x, y, s->slice.width, s->slice.height); | 2977 | NSRect dr = NSMakeRect (x, y, s->slice.width, s->slice.height); |
| 2978 | NSRect ir = NSMakeRect (s->slice.x, s->slice.y, | ||
| 2979 | s->slice.width, s->slice.height); | ||
| 2978 | [img drawInRect: dr | 2980 | [img drawInRect: dr |
| 2979 | fromRect: NSZeroRect | 2981 | fromRect: ir |
| 2980 | operation: NSCompositeSourceOver | 2982 | operation: NSCompositeSourceOver |
| 2981 | fraction: 1.0 | 2983 | fraction: 1.0 |
| 2982 | respectFlipped: YES | 2984 | respectFlipped: YES |