Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 18:37:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

(mac_create_cg_image_from_image, image_load_image_io)

Browse source 
[USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host.
This commit is contained in:
YAMAMOTO Mitsuharu 2008-07-21 04:20:37 +00:00
parent 2165e88127
commit 1802dc0c33
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/image.c
View file

@ -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;