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

[Miles Bader]

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

Index: macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -b -r1.254 -r1.255
--- macterm.c   17 Jul 2008 23:18:56 -0000      1.254
+++ macterm.c   26 Jul 2008 09:13:24 -0000      1.255
@@ -521,21 +521,14 @@
   if (ximg->bits_per_pixel == 32)
     {
       color_space = mac_cg_color_space_rgb;
-      alpha_info = (kCGImageAlphaNoneSkipFirst
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
-                   | kCGBitmapByteOrder32Host
-#endif
-                   );
+      alpha_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host;
     }
   else
     {
       color_space = NULL;
       alpha_info = kCGImageAlphaOnly;
     }
-  if (color_space == NULL)
-    return;
-  context = CGBitmapContextCreate (ximg->data, ximg->width,
-                                  ximg->height, 8,
+  context = CGBitmapContextCreate (ximg->data, ximg->width, ximg->height, 8,
                                   ximg->bytes_per_line, color_space,
                                   alpha_info);
   if (ximg->bits_per_pixel == 32)
@@ -855,10 +848,7 @@
                                   pixmap->bytes_per_line,
                                   mac_cg_color_space_rgb,
                                   kCGImageAlphaNoneSkipFirst
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
-                                  | kCGBitmapByteOrder32Host
-#endif
-                                  );
+                                  | kCGBitmapByteOrder32Host);
 
   CG_SET_FILL_COLOR (context, fg);
   CGContextFillRect (context, CGRectMake (0, 0, width, height));