diff options
-rw-r--r-- | src/ChangeLog | 19 | ||||
-rw-r--r-- | src/image.c | 15 | ||||
-rw-r--r-- | src/macterm.c | 16 | ||||
-rw-r--r-- | src/macterm.h | 6 | ||||
-rw-r--r-- | src/w32inevt.c | 1 |
5 files changed, 34 insertions, 23 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 517984d25e..7fc50521d1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,22 @@ +2008-07-26 YAMAMOTO Mitsuharu <[email protected]> + + * macterm.c (XDrawLine) [USE_MAC_IMAGE_IO]: Remove spurious return. + +2008-07-26 YAMAMOTO Mitsuharu <[email protected]> + + * macterm.h (kCGBitmapByteOrder32Host): New define for + non-universal SDKs. + + * image.c (mac_create_cg_image_from_image, image_load_image_io) + [USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host. + + * macterm.c (XDrawLine, XCreatePixmapFromBitmapData) + [USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host. + +2008-07-26 David Robinow <[email protected]> (tiny change) + + * w32inevt.c: Include dispextern.h. + 2008-07-26 Andreas Schwab <[email protected]> * print.c (print_object): Fix off-by-one in last change. diff --git a/src/image.c b/src/image.c index 65208c4783..7aee1e6512 100644 --- a/src/image.c +++ b/src/image.c @@ -379,12 +379,10 @@ mac_create_cg_image_from_image (f, img) ximg->data = NULL; result = CGImageCreate (ximg->width, ximg->height, 8, 32, ximg->bytes_per_line, mac_cg_color_space_rgb, - (img->mask ? kCGImageAlphaPremultipliedFirst - : kCGImageAlphaNoneSkipFirst) -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - | kCGBitmapByteOrder32Host -#endif - , provider, NULL, 0, kCGRenderingIntentDefault); + ((img->mask ? kCGImageAlphaPremultipliedFirst + : kCGImageAlphaNoneSkipFirst) + | kCGBitmapByteOrder32Host), + provider, NULL, 0, kCGRenderingIntentDefault); CGDataProviderRelease (provider); UNBLOCK_INPUT; @@ -2827,10 +2825,7 @@ image_load_image_io (f, img, type) 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; diff --git a/src/macterm.c b/src/macterm.c index a387faa7d4..4deaa91dc5 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -521,21 +521,14 @@ 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 { 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 @@ 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)); diff --git a/src/macterm.h b/src/macterm.h index 148f073e4a..28318a6d0b 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -601,7 +601,13 @@ enum { kEventParamWindowMouseLocation = 'wmou' }; #endif + +/* kCGBitmapByteOrder32Host is defined in Universal SDK for 10.4 but + not in PPC SDK for 10.4.0. */ +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 && !defined (kCGBitmapByteOrder32Host) +#define kCGBitmapByteOrder32Host 0 #endif +#endif /* MAC_OSX */ struct frame; struct face; diff --git a/src/w32inevt.c b/src/w32inevt.c index 7932990061..0e5d4dd1f2 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -38,6 +38,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "lisp.h" #include "keyboard.h" #include "frame.h" +#include "dispextern.h" #include "blockinput.h" #include "termhooks.h" #include "w32heap.h" |