include/SDL_pixels.h
branchSDL-1.3
changeset 1668 4da1ee79c9af
parent 1662 782fd950bd46
child 1675 d33dcfc3fde7
     1.1 --- a/include/SDL_pixels.h	Mon May 29 03:53:21 2006 +0000
     1.2 +++ b/include/SDL_pixels.h	Mon May 29 04:04:35 2006 +0000
     1.3 @@ -109,64 +109,64 @@
     1.4  {
     1.5      SDL_PixelFormat_Unknown,
     1.6      SDL_PixelFormat_Index1LSB =
     1.7 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Index1, SDL_BitmapOrder_1234, 0,
     1.8 -                                1, 0),
     1.9 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Index1, SDL_BitmapOrder_1234, 0,
    1.10 +                               1, 0),
    1.11      SDL_PixelFormat_Index1MSB =
    1.12 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Index1, SDL_BitmapOrder_4321, 0,
    1.13 -                                1, 0),
    1.14 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Index1, SDL_BitmapOrder_4321, 0,
    1.15 +                               1, 0),
    1.16      SDL_PixelFormat_Index4LSB =
    1.17 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Index4, SDL_BitmapOrder_1234, 0,
    1.18 -                                2, 0),
    1.19 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Index4, SDL_BitmapOrder_1234, 0,
    1.20 +                               2, 0),
    1.21      SDL_PixelFormat_Index4MSB =
    1.22 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Index4, SDL_BitmapOrder_4321, 0,
    1.23 -                                2, 0),
    1.24 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Index4, SDL_BitmapOrder_4321, 0,
    1.25 +                               2, 0),
    1.26      SDL_PixelFormat_Index8 =
    1.27 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Index8, 0, 0, 8, 1),
    1.28 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Index8, 0, 0, 8, 1),
    1.29      SDL_PixelFormat_RGB332 =
    1.30 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed8, SDL_PackedOrder_XRGB,
    1.31 -                                SDL_PackedLayout_332, 8, 1),
    1.32 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed8, SDL_PackedOrder_XRGB,
    1.33 +                               SDL_PackedLayout_332, 8, 1),
    1.34      SDL_PixelFormat_RGB444 =
    1.35 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed16, SDL_PackedOrder_XRGB,
    1.36 -                                SDL_PackedLayout_4444, 12, 2),
    1.37 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed16, SDL_PackedOrder_XRGB,
    1.38 +                               SDL_PackedLayout_4444, 12, 2),
    1.39      SDL_PixelFormat_RGB555 =
    1.40 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed16, SDL_PackedOrder_XRGB,
    1.41 -                                SDL_PackedLayout_1555, 15, 2),
    1.42 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed16, SDL_PackedOrder_XRGB,
    1.43 +                               SDL_PackedLayout_1555, 15, 2),
    1.44      SDL_PixelFormat_ARGB4444 =
    1.45 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed16, SDL_PackedOrder_ARGB,
    1.46 -                                SDL_PackedLayout_4444, 16, 2),
    1.47 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed16, SDL_PackedOrder_ARGB,
    1.48 +                               SDL_PackedLayout_4444, 16, 2),
    1.49      SDL_PixelFormat_ARGB1555 =
    1.50 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed16, SDL_PackedOrder_ARGB,
    1.51 -                                SDL_PackedLayout_1555, 16, 2),
    1.52 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed16, SDL_PackedOrder_ARGB,
    1.53 +                               SDL_PackedLayout_1555, 16, 2),
    1.54      SDL_PixelFormat_RGB565 =
    1.55 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed16, SDL_PackedOrder_XRGB,
    1.56 -                                SDL_PackedLayout_565, 16, 2),
    1.57 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed16, SDL_PackedOrder_XRGB,
    1.58 +                               SDL_PackedLayout_565, 16, 2),
    1.59      SDL_PixelFormat_RGB24 =
    1.60 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_ArrayU8, SDL_ArrayOrder_RGB, 0,
    1.61 -                                24, 3),
    1.62 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_ArrayU8, SDL_ArrayOrder_RGB, 0,
    1.63 +                               24, 3),
    1.64      SDL_PixelFormat_BGR24 =
    1.65 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_ArrayU8, SDL_ArrayOrder_BGR, 0,
    1.66 -                                24, 3),
    1.67 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_ArrayU8, SDL_ArrayOrder_BGR, 0,
    1.68 +                               24, 3),
    1.69      SDL_PixelFormat_RGB888 =
    1.70 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed32, SDL_PackedOrder_XRGB,
    1.71 -                                SDL_PackedLayout_8888, 24, 4),
    1.72 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_XRGB,
    1.73 +                               SDL_PackedLayout_8888, 24, 4),
    1.74      SDL_PixelFormat_BGR888 =
    1.75 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed32, SDL_PackedOrder_XBGR,
    1.76 -                                SDL_PackedLayout_8888, 24, 4),
    1.77 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_XBGR,
    1.78 +                               SDL_PackedLayout_8888, 24, 4),
    1.79      SDL_PixelFormat_ARGB8888 =
    1.80 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed32, SDL_PackedOrder_ARGB,
    1.81 -                                SDL_PackedLayout_8888, 32, 4),
    1.82 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_ARGB,
    1.83 +                               SDL_PackedLayout_8888, 32, 4),
    1.84      SDL_PixelFormat_RGBA8888 =
    1.85 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed32, SDL_PackedOrder_RGBA,
    1.86 -                                SDL_PackedLayout_8888, 32, 4),
    1.87 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_RGBA,
    1.88 +                               SDL_PackedLayout_8888, 32, 4),
    1.89      SDL_PixelFormat_ABGR8888 =
    1.90 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed32, SDL_PackedOrder_ABGR,
    1.91 -                                SDL_PackedLayout_8888, 32, 4),
    1.92 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_ABGR,
    1.93 +                               SDL_PackedLayout_8888, 32, 4),
    1.94      SDL_PixelFormat_BGRA8888 =
    1.95 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed32, SDL_PackedOrder_BGRA,
    1.96 -                                SDL_PackedLayout_8888, 32, 4),
    1.97 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_BGRA,
    1.98 +                               SDL_PackedLayout_8888, 32, 4),
    1.99      SDL_PixelFormat_ARGB2101010 =
   1.100 -        SDL_DEFINE_PIXELFORMAT (SDL_PixelType_Packed32, SDL_PackedOrder_ARGB,
   1.101 -                                SDL_PackedLayout_2101010, 32, 4),
   1.102 +        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_ARGB,
   1.103 +                               SDL_PackedLayout_2101010, 32, 4),
   1.104  };
   1.105  
   1.106  typedef struct SDL_Color
   1.107 @@ -213,19 +213,19 @@
   1.108   * Convert one of the enumerated formats above to a bpp and RGBA masks.
   1.109   * Returns SDL_TRUE, or SDL_FALSE if the conversion wasn't possible.
   1.110   */
   1.111 -extern DECLSPEC SDL_bool SDL_PixelFormatEnumToMasks (Uint32 format, int *bpp,
   1.112 -                                                     Uint32 * Rmask,
   1.113 -                                                     Uint32 * Gmask,
   1.114 -                                                     Uint32 * Bmask,
   1.115 -                                                     Uint32 * Amask);
   1.116 +extern DECLSPEC SDL_bool SDL_PixelFormatEnumToMasks(Uint32 format, int *bpp,
   1.117 +                                                    Uint32 * Rmask,
   1.118 +                                                    Uint32 * Gmask,
   1.119 +                                                    Uint32 * Bmask,
   1.120 +                                                    Uint32 * Amask);
   1.121  
   1.122  /*
   1.123   * Convert a bpp and RGBA masks to one of the enumerated formats above.
   1.124   * Returns SDL_PixelFormat_Unknown if the conversion wasn't possible.
   1.125   */
   1.126 -extern DECLSPEC Uint32 SDL_MasksToPixelFormatEnum (int bpp, Uint32 Rmask,
   1.127 -                                                   Uint32 Gmask, Uint32 Bmask,
   1.128 -                                                   Uint32 Amask);
   1.129 +extern DECLSPEC Uint32 SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask,
   1.130 +                                                  Uint32 Gmask, Uint32 Bmask,
   1.131 +                                                  Uint32 Amask);
   1.132  
   1.133  /* Ends C function definitions when using C++ */
   1.134  #ifdef __cplusplus