From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 21 Jul 2008 04:20:37 +0000 (+0000)
Subject: (mac_create_cg_image_from_image, image_load_image_io)
X-Git-Tag: emacs-pretest-22.2.90~100
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1802dc0c331a23eafee370ed6d43a210704a7f1a;p=emacs.git

(mac_create_cg_image_from_image, image_load_image_io)
[USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host.
---

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;