From 0e9378b39886647401ff85c0df65e95a345a4e95 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Sun, 4 May 2008 00:32:24 +0000 Subject: [PATCH] (XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]: Create bitmap context in native byte order. --- src/ChangeLog | 8 ++++++++ src/macterm.c | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c0e2fe08390..f5b038846e9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2008-05-04 YAMAMOTO Mitsuharu + + * image.c [USE_MAC_IMAGE_IO] (image_load_image_io): + Create bitmap context in native byte order. + + * macterm.c (XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]: + Create bitmap context in native byte order. + 2008-05-03 Eli Zaretskii * dired.c (Ffile_attributes): Don't allow the device number become diff --git a/src/macterm.c b/src/macterm.c index 0023c8988a0..8886cdb565b 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -415,7 +415,11 @@ XDrawLine (display, p, gc, x1, y1, x2, y2) if (ximg->bits_per_pixel == 32) { color_space = mac_cg_color_space_rgb; - alpha_info = kCGImageAlphaNoneSkipFirst; + alpha_info = (kCGImageAlphaNoneSkipFirst +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 + | kCGBitmapByteOrder32Host +#endif + ); } else { @@ -743,7 +747,11 @@ XCreatePixmapFromBitmapData (display, w, data, width, height, fg, bg, depth) context = CGBitmapContextCreate (pixmap->data, width, height, 8, pixmap->bytes_per_line, mac_cg_color_space_rgb, - kCGImageAlphaNoneSkipFirst); + kCGImageAlphaNoneSkipFirst +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 + | kCGBitmapByteOrder32Host +#endif + ); CG_SET_FILL_COLOR (context, fg); CGContextFillRect (context, CGRectMake (0, 0, width, height)); -- 2.11.4.GIT