Mercurial > emacs
changeset 80617:48a714a8e3a6
(XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]:
Remove conditionals for kCGBitmapByteOrder32Host.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Mon, 21 Jul 2008 04:20:49 +0000 |
| parents | 3af78d9da472 |
| children | 52ca202ae787 |
| files | src/macterm.c |
| diffstat | 1 files changed, 2 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macterm.c Mon Jul 21 04:20:37 2008 +0000 +++ b/src/macterm.c Mon Jul 21 04:20:49 2008 +0000 @@ -415,11 +415,7 @@ if (ximg->bits_per_pixel == 32) { color_space = mac_cg_color_space_rgb; - alpha_info = (kCGImageAlphaNoneSkipFirst -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - | kCGBitmapByteOrder32Host -#endif - ); + alpha_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host; } else { @@ -748,10 +744,7 @@ pixmap->bytes_per_line, mac_cg_color_space_rgb, kCGImageAlphaNoneSkipFirst -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - | kCGBitmapByteOrder32Host -#endif - ); + | kCGBitmapByteOrder32Host); CG_SET_FILL_COLOR (context, fg); CGContextFillRect (context, CGRectMake (0, 0, width, height));