comparison include/SDL_pixels.h @ 2208:b03710fb0333

Fixed bug #467 Remove trailing commas from enums
author Sam Lantinga <slouken@libsdl.org>
date Sun, 22 Jul 2007 13:22:47 +0000
parents a788656ca29a
children 340942cfda48
comparison
equal deleted inserted replaced
2207:d63e9f5944ae 2208:b03710fb0333
48 SDL_PIXELTYPE_PACKED32, 48 SDL_PIXELTYPE_PACKED32,
49 SDL_PIXELTYPE_ARRAYU8, 49 SDL_PIXELTYPE_ARRAYU8,
50 SDL_PIXELTYPE_ARRAYU16, 50 SDL_PIXELTYPE_ARRAYU16,
51 SDL_PIXELTYPE_ARRAYU32, 51 SDL_PIXELTYPE_ARRAYU32,
52 SDL_PIXELTYPE_ARRAYF16, 52 SDL_PIXELTYPE_ARRAYF16,
53 SDL_PIXELTYPE_ARRAYF32, 53 SDL_PIXELTYPE_ARRAYF32
54 }; 54 };
55 55
56 enum 56 enum
57 { /* bitmap pixel order, high bit -> low bit */ 57 { /* bitmap pixel order, high bit -> low bit */
58 SDL_BITMAPORDER_NONE, 58 SDL_BITMAPORDER_NONE,
59 SDL_BITMAPORDER_4321, 59 SDL_BITMAPORDER_4321,
60 SDL_BITMAPORDER_1234, 60 SDL_BITMAPORDER_1234
61 }; 61 };
62 enum 62 enum
63 { /* packed component order, high bit -> low bit */ 63 { /* packed component order, high bit -> low bit */
64 SDL_PACKEDORDER_NONE, 64 SDL_PACKEDORDER_NONE,
65 SDL_PACKEDORDER_XRGB, 65 SDL_PACKEDORDER_XRGB,
67 SDL_PACKEDORDER_ARGB, 67 SDL_PACKEDORDER_ARGB,
68 SDL_PACKEDORDER_RGBA, 68 SDL_PACKEDORDER_RGBA,
69 SDL_PACKEDORDER_XBGR, 69 SDL_PACKEDORDER_XBGR,
70 SDL_PACKEDORDER_BGRX, 70 SDL_PACKEDORDER_BGRX,
71 SDL_PACKEDORDER_ABGR, 71 SDL_PACKEDORDER_ABGR,
72 SDL_PACKEDORDER_BGRA, 72 SDL_PACKEDORDER_BGRA
73 }; 73 };
74 enum 74 enum
75 { /* array component order, low byte -> high byte */ 75 { /* array component order, low byte -> high byte */
76 SDL_ARRAYORDER_NONE, 76 SDL_ARRAYORDER_NONE,
77 SDL_ARRAYORDER_RGB, 77 SDL_ARRAYORDER_RGB,
78 SDL_ARRAYORDER_RGBA, 78 SDL_ARRAYORDER_RGBA,
79 SDL_ARRAYORDER_ARGB, 79 SDL_ARRAYORDER_ARGB,
80 SDL_ARRAYORDER_BGR, 80 SDL_ARRAYORDER_BGR,
81 SDL_ARRAYORDER_BGRA, 81 SDL_ARRAYORDER_BGRA,
82 SDL_ARRAYORDER_ABGR, 82 SDL_ARRAYORDER_ABGR
83 }; 83 };
84 84
85 enum 85 enum
86 { /* Packed component layout */ 86 { /* Packed component layout */
87 SDL_PACKEDLAYOUT_NONE, 87 SDL_PACKEDLAYOUT_NONE,
90 SDL_PACKEDLAYOUT_1555, 90 SDL_PACKEDLAYOUT_1555,
91 SDL_PACKEDLAYOUT_5551, 91 SDL_PACKEDLAYOUT_5551,
92 SDL_PACKEDLAYOUT_565, 92 SDL_PACKEDLAYOUT_565,
93 SDL_PACKEDLAYOUT_8888, 93 SDL_PACKEDLAYOUT_8888,
94 SDL_PACKEDLAYOUT_2101010, 94 SDL_PACKEDLAYOUT_2101010,
95 SDL_PACKEDLAYOUT_1010102, 95 SDL_PACKEDLAYOUT_1010102
96 }; 96 };
97 97
98 #define SDL_DEFINE_PIXELFOURCC(A, B, C, D) \ 98 #define SDL_DEFINE_PIXELFOURCC(A, B, C, D) \
99 ((A) | ((B) << 8) | ((C) << 16) | ((D) << 24)) 99 ((A) | ((B) << 8) | ((C) << 16) | ((D) << 24))
100 100
186 SDL_PIXELFORMAT_YUY2 = /* Packed mode: Y0+U0+Y1+V0 (1 plane) */ 186 SDL_PIXELFORMAT_YUY2 = /* Packed mode: Y0+U0+Y1+V0 (1 plane) */
187 SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2'), 187 SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2'),
188 SDL_PIXELFORMAT_UYVY = /* Packed mode: U0+Y0+V0+Y1 (1 plane) */ 188 SDL_PIXELFORMAT_UYVY = /* Packed mode: U0+Y0+V0+Y1 (1 plane) */
189 SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'), 189 SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'),
190 SDL_PIXELFORMAT_YVYU = /* Packed mode: Y0+V0+Y1+U0 (1 plane) */ 190 SDL_PIXELFORMAT_YVYU = /* Packed mode: Y0+V0+Y1+U0 (1 plane) */
191 SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U'), 191 SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U')
192 }; 192 };
193 193
194 typedef struct SDL_Color 194 typedef struct SDL_Color
195 { 195 {
196 Uint8 r; 196 Uint8 r;