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

[YAMAMOTO Mitsuharu]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     YAMAMOTO Mitsuharu <mituharu>   08/07/21 04:20:39

Index: image.c
===================================================================
RCS file: /sources/emacs/emacs/src/image.c,v
retrieving revision 1.65.2.16
retrieving revision 1.65.2.17
diff -u -b -r1.65.2.16 -r1.65.2.17
--- image.c     7 Jul 2008 09:31:26 -0000       1.65.2.16
+++ image.c     21 Jul 2008 04:20:37 -0000      1.65.2.17
@@ -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
+                         ((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;
 
@@ -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;