Mercurial > sdl-ios-xcode
diff include/SDL_pixels.h @ 4755:436183eb30c8
Merge with main repo (mainly for non-printable character fix)
author | dewyatt |
---|---|
date | Sun, 18 Jul 2010 13:48:23 -0400 |
parents | bff93336121e |
children | 660d3a432102 |
line wrap: on
line diff
--- a/include/SDL_pixels.h Tue Jul 13 15:05:45 2010 -0400 +++ b/include/SDL_pixels.h Sun Jul 18 13:48:23 2010 -0400 @@ -112,8 +112,7 @@ SDL_PACKEDLAYOUT_1010102 }; -#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) \ - ((A) | ((B) << 8) | ((C) << 16) | ((D) << 24)) +#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D) #define SDL_DEFINE_PIXELFORMAT(type, order, layout, bits, bytes) \ ((1 << 31) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \