]> git.eshelyaron.com Git - emacs.git/commitdiff
(XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]:
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Mon, 21 Jul 2008 04:20:49 +0000 (04:20 +0000)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Mon, 21 Jul 2008 04:20:49 +0000 (04:20 +0000)
Remove conditionals for kCGBitmapByteOrder32Host.

src/macterm.c

index 43fcfd514cfdf3a9eb1e32988c073b7e0e272822..f73050788c20393406378b2f2f01ce0d788c75f5 100644 (file)
@@ -415,11 +415,7 @@ XDrawLine (display, p, gc, x1, y1, x2, y2)
   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
     {
@@ -748,10 +744,7 @@ XCreatePixmapFromBitmapData (display, w, data, width, height, fg, bg, depth)
                                   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));