diff options
| author | YAMAMOTO Mitsuharu | 2008-07-21 04:20:49 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2008-07-21 04:20:49 +0000 |
| commit | 91b953ac7f8b854010eef0b00bfc12b040abc4ed (patch) | |
| tree | d3b8b011d016e775f54b193ea0f8781024d681fb /src | |
| parent | 1802dc0c331a23eafee370ed6d43a210704a7f1a (diff) | |
| download | emacs-91b953ac7f8b854010eef0b00bfc12b040abc4ed.tar.gz emacs-91b953ac7f8b854010eef0b00bfc12b040abc4ed.zip | |
(XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]:
Remove conditionals for kCGBitmapByteOrder32Host.
Diffstat (limited to 'src')
| -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) | |||
| 415 | if (ximg->bits_per_pixel == 32) | 415 | if (ximg->bits_per_pixel == 32) |
| 416 | { | 416 | { |
| 417 | color_space = mac_cg_color_space_rgb; | 417 | color_space = mac_cg_color_space_rgb; |
| 418 | alpha_info = (kCGImageAlphaNoneSkipFirst | 418 | alpha_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host; |
| 419 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 | ||
| 420 | | kCGBitmapByteOrder32Host | ||
| 421 | #endif | ||
| 422 | ); | ||
| 423 | } | 419 | } |
| 424 | else | 420 | else |
| 425 | { | 421 | { |
| @@ -748,10 +744,7 @@ XCreatePixmapFromBitmapData (display, w, data, width, height, fg, bg, depth) | |||
| 748 | pixmap->bytes_per_line, | 744 | pixmap->bytes_per_line, |
| 749 | mac_cg_color_space_rgb, | 745 | mac_cg_color_space_rgb, |
| 750 | kCGImageAlphaNoneSkipFirst | 746 | kCGImageAlphaNoneSkipFirst |
| 751 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 | 747 | | kCGBitmapByteOrder32Host); |
| 752 | | kCGBitmapByteOrder32Host | ||
| 753 | #endif | ||
| 754 | ); | ||
| 755 | 748 | ||
| 756 | CG_SET_FILL_COLOR (context, fg); | 749 | CG_SET_FILL_COLOR (context, fg); |
| 757 | CGContextFillRect (context, CGRectMake (0, 0, width, height)); | 750 | CGContextFillRect (context, CGRectMake (0, 0, width, height)); |