diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2008-07-21 04:20:49 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2008-07-21 04:20:49 +0000 |
| commit | 91b953ac7f8b854010eef0b00bfc12b040abc4ed (patch) | |
| tree | d3b8b011d016e775f54b193ea0f8781024d681fb /src/macterm.c | |
| parent | 1802dc0c331a23eafee370ed6d43a210704a7f1a (diff) | |
| download | emacs-91b953ac7f8b854010eef0b00bfc12b040abc4ed.tar.gz | |
(XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]:
Remove conditionals for kCGBitmapByteOrder32Host.
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/macterm.c b/src/macterm.c index 43fcfd514cf..f73050788c2 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -415,11 +415,7 @@ XDrawLine (display, p, gc, x1, y1, x2, y2) 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 @@ XCreatePixmapFromBitmapData (display, w, data, width, height, fg, bg, depth) 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)); |