Merge from emacs--rel--22

[gnu-emacs] / src / image.c

diff --git a/src/image.c b/src/image.c
index 65208c4783d853f78177e1102a1f5c24f036e5e8..7aee1e6512eb577c221ff9851c9cf593677c585d 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -379,12 +379,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;
 
@@ -2827,10 +2825,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;