From 7abc7de1a15b4b8ec6cc186883c010e0ddbd9b51 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 10 Nov 2009 06:16:45 +0000 Subject: [PATCH] There's Host endianness for the channel order. --- IMG_ImageIO.c | 16 ++++------------ IMG_UIImage.m | 16 ++++------------ 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/IMG_ImageIO.c b/IMG_ImageIO.c index 09be1d21..6423127a 100644 --- a/IMG_ImageIO.c +++ b/IMG_ImageIO.c @@ -249,13 +249,9 @@ static SDL_Surface* Create_SDL_Surface_From_CGImage(CGImageRef image_ref) case 32: { color_space = CGColorSpaceCreateDeviceRGB(); -#if __BIG_ENDIAN__ - //bitmap_info = kCGImageAlphaFirst | kCGBitmapByteOrder32Big; /* ARGB Big Endian */ - bitmap_info = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Big; /* ARGB Big Endian */ -#else - //bitmap_info = kCGImageAlphaFirst | kCGBitmapByteOrder32Little; /* ARGB Little Endian */ - bitmap_info = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little; /* ARGB Little Endian */ -#endif + //bitmap_info = kCGImageAlphaFirst | kCGBitmapByteOrder32Host; /* ARGB */ + bitmap_info = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host; /* ARGB */ + Amask = 0xFF000000; Rmask = 0x00FF0000; Gmask = 0x0000FF00; @@ -267,11 +263,7 @@ static SDL_Surface* Create_SDL_Surface_From_CGImage(CGImageRef image_ref) default: { color_space = CGColorSpaceCreateDeviceRGB(); -#if __BIG_ENDIAN__ - bitmap_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Big; /* XRGB Big Endian */ -#else - bitmap_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little; /* XRGB Little Endian */ -#endif + bitmap_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host; /* XRGB */ Amask = 0x00000000; Rmask = 0x00FF0000; Gmask = 0x0000FF00; diff --git a/IMG_UIImage.m b/IMG_UIImage.m index 0aa2f9e0..b63ca827 100644 --- a/IMG_UIImage.m +++ b/IMG_UIImage.m @@ -44,13 +44,9 @@ case 32: { color_space = CGColorSpaceCreateDeviceRGB(); -#if __BIG_ENDIAN__ - //bitmap_info = kCGImageAlphaFirst | kCGBitmapByteOrder32Big; /* ARGB Big Endian */ - bitmap_info = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Big; /* ARGB Big Endian */ -#else - //bitmap_info = kCGImageAlphaFirst | kCGBitmapByteOrder32Little; /* ARGB Little Endian */ - bitmap_info = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little; /* ARGB Little Endian */ -#endif + //bitmap_info = kCGImageAlphaFirst | kCGBitmapByteOrder32Host; /* ARGB */ + bitmap_info = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host; /* ARGB */ + Amask = 0xFF000000; Rmask = 0x00FF0000; Gmask = 0x0000FF00; @@ -62,11 +58,7 @@ default: { color_space = CGColorSpaceCreateDeviceRGB(); -#if __BIG_ENDIAN__ - bitmap_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Big; /* XRGB Big Endian */ -#else - bitmap_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little; /* XRGB Little Endian */ -#endif + bitmap_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host; /* XRGB */ Amask = 0x00000000; Rmask = 0x00FF0000; Gmask = 0x0000FF00;