# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1216614037 0
# Node ID 3af78d9da4728ecd89808d8c9c819b7661f61628
# Parent  ed3882ec964423bf4ca8c4ba6bf0f30180aa4145
(mac_create_cg_image_from_image, image_load_image_io)
[USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host.

diff -r ed3882ec9644 -r 3af78d9da472 src/image.c
--- a/src/image.c	Fri Jul 18 08:59:50 2008 +0000
+++ b/src/image.c	Mon Jul 21 04:20:37 2008 +0000
@@ -354,12 +354,10 @@
   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 @@
 				   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;