diff options
| author | YAMAMOTO Mitsuharu | 2008-07-21 04:20:37 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2008-07-21 04:20:37 +0000 |
| commit | 1802dc0c331a23eafee370ed6d43a210704a7f1a (patch) | |
| tree | 912e1b69efa20410fff71508094ab13c1a1cec11 /src | |
| parent | 2165e881272884e2075052e4e99c26f8e786f83a (diff) | |
| download | emacs-1802dc0c331a23eafee370ed6d43a210704a7f1a.tar.gz emacs-1802dc0c331a23eafee370ed6d43a210704a7f1a.zip | |
(mac_create_cg_image_from_image, image_load_image_io)
[USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host.
Diffstat (limited to 'src')
| -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) | |||
| 354 | ximg->data = NULL; | 354 | ximg->data = NULL; |
| 355 | result = CGImageCreate (ximg->width, ximg->height, 8, 32, | 355 | result = CGImageCreate (ximg->width, ximg->height, 8, 32, |
| 356 | ximg->bytes_per_line, mac_cg_color_space_rgb, | 356 | ximg->bytes_per_line, mac_cg_color_space_rgb, |
| 357 | (img->mask ? kCGImageAlphaPremultipliedFirst | 357 | ((img->mask ? kCGImageAlphaPremultipliedFirst |
| 358 | : kCGImageAlphaNoneSkipFirst) | 358 | : kCGImageAlphaNoneSkipFirst) |
| 359 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 | 359 | | kCGBitmapByteOrder32Host), |
| 360 | | kCGBitmapByteOrder32Host | 360 | provider, NULL, 0, kCGRenderingIntentDefault); |
| 361 | #endif | ||
| 362 | , provider, NULL, 0, kCGRenderingIntentDefault); | ||
| 363 | CGDataProviderRelease (provider); | 361 | CGDataProviderRelease (provider); |
| 364 | UNBLOCK_INPUT; | 362 | UNBLOCK_INPUT; |
| 365 | 363 | ||
| @@ -2682,10 +2680,7 @@ image_load_image_io (f, img, type) | |||
| 2682 | ximg->bytes_per_line, | 2680 | ximg->bytes_per_line, |
| 2683 | mac_cg_color_space_rgb, | 2681 | mac_cg_color_space_rgb, |
| 2684 | kCGImageAlphaNoneSkipFirst | 2682 | kCGImageAlphaNoneSkipFirst |
| 2685 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 | 2683 | | kCGBitmapByteOrder32Host); |
| 2686 | | kCGBitmapByteOrder32Host | ||
| 2687 | #endif | ||
| 2688 | ); | ||
| 2689 | if (has_alpha_p) | 2684 | if (has_alpha_p) |
| 2690 | { | 2685 | { |
| 2691 | Lisp_Object specified_bg; | 2686 | Lisp_Object specified_bg; |