[Emacs-diffs] Changes to emacs/src/image.c,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/07/26 09:13:27

Index: image.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/image.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- image.c     25 Jul 2008 17:11:42 -0000      1.110
+++ image.c     26 Jul 2008 09:13:26 -0000      1.111
@@ -379,12 +379,10 @@
   ximg->data = NULL;
   result = CGImageCreate (ximg->width, ximg->height, 8, 32,
                          ximg->bytes_per_line, mac_cg_color_space_rgb,
-                         (img->mask ? kCGImageAlphaPremultipliedFirst
+                         ((img->mask ? kCGImageAlphaPremultipliedFirst
                           : kCGImageAlphaNoneSkipFirst)
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
-                         | kCGBitmapByteOrder32Host
-#endif
-                         , provider, NULL, 0, kCGRenderingIntentDefault);
+                          | kCGBitmapByteOrder32Host),
+                         provider, NULL, 0, kCGRenderingIntentDefault);
   CGDataProviderRelease (provider);
   UNBLOCK_INPUT;
 
@@ -2827,10 +2825,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;