diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2008-07-21 04:20:37 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2008-07-21 04:20:37 +0000 |
| commit | 88b852d815a4f281a2af243f797fb725af6e80f9 (patch) | |
| tree | 77aeaea923de16330879f0abf27e1112be72503c | |
| parent | 4f34a4a6036a2288a268f9d42fe6a8532b910e93 (diff) | |
| download | emacs-88b852d815a4f281a2af243f797fb725af6e80f9.tar.gz | |
(mac_create_cg_image_from_image, image_load_image_io)
[USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host.
| -rw-r--r-- | src/image.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/image.c b/src/image.c index f2dc1ae30ca..befddefe99b 100644 --- a/src/image.c +++ b/src/image.c @@ -354,12 +354,10 @@ mac_create_cg_image_from_image (f, img) ximg->data = NULL; result = CGImageCreate (ximg->width, ximg->height, 8, 32, ximg->bytes_per_line, mac_cg_color_space_rgb, - (img->mask ? kCGImageAlphaPremultipliedFirst - : kCGImageAlphaNoneSkipFirst) -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - | kCGBitmapByteOrder32Host -#endif - , provider, NULL, 0, kCGRenderingIntentDefault); + ((img->mask ? kCGImageAlphaPremultipliedFirst + : kCGImageAlphaNoneSkipFirst) + | kCGBitmapByteOrder32Host), + provider, NULL, 0, kCGRenderingIntentDefault); CGDataProviderRelease (provider); UNBLOCK_INPUT; @@ -2682,10 +2680,7 @@ image_load_image_io (f, img, type) ximg->bytes_per_line, mac_cg_color_space_rgb, kCGImageAlphaNoneSkipFirst -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - | kCGBitmapByteOrder32Host -#endif - ); + | kCGBitmapByteOrder32Host); if (has_alpha_p) { Lisp_Object specified_bg; |