Yes, it compiles now.
authorSam Lantinga <slouken@libsdl.org>
Sat, 19 Feb 2011 16:41:01 -0800
changeset 5352e0da15452037
parent 5351 176cd91c3907
child 5353 7358c810e5dd
Yes, it compiles now.
src/video/SDL_pixels.c
     1.1 --- a/src/video/SDL_pixels.c	Sat Feb 19 14:27:16 2011 -0800
     1.2 +++ b/src/video/SDL_pixels.c	Sat Feb 19 16:41:01 2011 -0800
     1.3 @@ -243,18 +243,18 @@
     1.4              Gmask == 0x1C &&
     1.5              Bmask == 0x03 &&
     1.6              Amask == 0x00) {
     1.7 -            return SDL_PIXELFORMAT_RGB332
     1.8 +            return SDL_PIXELFORMAT_RGB332;
     1.9          }
    1.10          break;
    1.11      case 12:
    1.12          if (Rmask == 0) {
    1.13 -            return SDL_PIXELFORMAT_RGB444
    1.14 +            return SDL_PIXELFORMAT_RGB444;
    1.15          }
    1.16          if (Rmask == 0x0F00 &&
    1.17              Gmask == 0x00F0 &&
    1.18              Bmask == 0x000F &&
    1.19              Amask == 0x0000) {
    1.20 -            return SDL_PIXELFORMAT_RGB444
    1.21 +            return SDL_PIXELFORMAT_RGB444;
    1.22          }
    1.23          break;
    1.24      case 15:
    1.25 @@ -270,73 +270,73 @@
    1.26              Gmask == 0x03E0 &&
    1.27              Bmask == 0x001F &&
    1.28              Amask == 0x0000) {
    1.29 -            return SDL_PIXELFORMAT_RGB555
    1.30 +            return SDL_PIXELFORMAT_RGB555;
    1.31          }
    1.32          if (Rmask == 0x001F &&
    1.33              Gmask == 0x03E0 &&
    1.34              Bmask == 0x7C00 &&
    1.35              Amask == 0x0000) {
    1.36 -            return SDL_PIXELFORMAT_BGR555
    1.37 +            return SDL_PIXELFORMAT_BGR555;
    1.38          }
    1.39          if (Rmask == 0x0F00 &&
    1.40              Gmask == 0x00F0 &&
    1.41              Bmask == 0x000F &&
    1.42              Amask == 0xF000) {
    1.43 -            return SDL_PIXELFORMAT_ARGB4444
    1.44 +            return SDL_PIXELFORMAT_ARGB4444;
    1.45          }
    1.46          if (Rmask == 0xF000 &&
    1.47              Gmask == 0x0F00 &&
    1.48              Bmask == 0x00F0 &&
    1.49              Amask == 0x000F) {
    1.50 -            return SDL_PIXELFORMAT_RGBA4444
    1.51 +            return SDL_PIXELFORMAT_RGBA4444;
    1.52          }
    1.53          if (Rmask == 0x000F &&
    1.54              Gmask == 0x00F0 &&
    1.55              Bmask == 0x0F00 &&
    1.56              Amask == 0xF000) {
    1.57 -            return SDL_PIXELFORMAT_ABGR4444
    1.58 +            return SDL_PIXELFORMAT_ABGR4444;
    1.59          }
    1.60          if (Rmask == 0x00F0 &&
    1.61              Gmask == 0x0F00 &&
    1.62              Bmask == 0xF000 &&
    1.63              Amask == 0x000F) {
    1.64 -            return SDL_PIXELFORMAT_BGRA4444
    1.65 +            return SDL_PIXELFORMAT_BGRA4444;
    1.66          }
    1.67          if (Rmask == 0x7C00 &&
    1.68              Gmask == 0x03E0 &&
    1.69              Bmask == 0x001F &&
    1.70              Amask == 0x8000) {
    1.71 -            return SDL_PIXELFORMAT_ARGB1555
    1.72 +            return SDL_PIXELFORMAT_ARGB1555;
    1.73          }
    1.74          if (Rmask == 0xF800 &&
    1.75              Gmask == 0x07C0 &&
    1.76              Bmask == 0x003E &&
    1.77              Amask == 0x0001) {
    1.78 -            return SDL_PIXELFORMAT_RGBA5551
    1.79 +            return SDL_PIXELFORMAT_RGBA5551;
    1.80          }
    1.81          if (Rmask == 0x001F &&
    1.82              Gmask == 0x03E0 &&
    1.83              Bmask == 0x7C00 &&
    1.84              Amask == 0x8000) {
    1.85 -            return SDL_PIXELFORMAT_ABGR1555
    1.86 +            return SDL_PIXELFORMAT_ABGR1555;
    1.87          }
    1.88          if (Rmask == 0x003E &&
    1.89              Gmask == 0x07C0 &&
    1.90              Bmask == 0xF800 &&
    1.91              Amask == 0x0001) {
    1.92 -            return SDL_PIXELFORMAT_BGRA5551
    1.93 +            return SDL_PIXELFORMAT_BGRA5551;
    1.94          }
    1.95          if (Rmask == 0xF800 &&
    1.96              Gmask == 0x07E0 &&
    1.97              Bmask == 0x001F &&
    1.98              Amask == 0x0000) {
    1.99 -            return SDL_PIXELFORMAT_RGB565
   1.100 +            return SDL_PIXELFORMAT_RGB565;
   1.101          }
   1.102          if (Rmask == 0x001F &&
   1.103              Gmask == 0x07E0 &&
   1.104              Bmask == 0xF800 &&
   1.105              Amask == 0x0000) {
   1.106 -            return SDL_PIXELFORMAT_BGR565
   1.107 +            return SDL_PIXELFORMAT_BGR565;
   1.108          }
   1.109          break;
   1.110      case 24:
   1.111 @@ -363,43 +363,43 @@
   1.112              Gmask == 0x0000FF00 &&
   1.113              Bmask == 0x000000FF &&
   1.114              Amask == 0x00000000) {
   1.115 -            return SDL_PIXELFORMAT_RGB888
   1.116 +            return SDL_PIXELFORMAT_RGB888;
   1.117          }
   1.118          if (Rmask == 0x000000FF &&
   1.119              Gmask == 0x0000FF00 &&
   1.120              Bmask == 0x00FF0000 &&
   1.121              Amask == 0x00000000) {
   1.122 -            return SDL_PIXELFORMAT_BGR888
   1.123 +            return SDL_PIXELFORMAT_BGR888;
   1.124          }
   1.125          if (Rmask == 0x00FF0000 &&
   1.126              Gmask == 0x0000FF00 &&
   1.127              Bmask == 0x000000FF &&
   1.128              Amask == 0xFF000000) {
   1.129 -            return SDL_PIXELFORMAT_ARGB8888
   1.130 +            return SDL_PIXELFORMAT_ARGB8888;
   1.131          }
   1.132          if (Rmask == 0xFF000000 &&
   1.133              Gmask == 0x00FF0000 &&
   1.134              Bmask == 0x0000FF00 &&
   1.135              Amask == 0x000000FF) {
   1.136 -            return SDL_PIXELFORMAT_RGBA8888
   1.137 +            return SDL_PIXELFORMAT_RGBA8888;
   1.138          }
   1.139          if (Rmask == 0x000000FF &&
   1.140              Gmask == 0x0000FF00 &&
   1.141              Bmask == 0x00FF0000 &&
   1.142              Amask == 0xFF000000) {
   1.143 -            return SDL_PIXELFORMAT_ABGR8888
   1.144 +            return SDL_PIXELFORMAT_ABGR8888;
   1.145          }
   1.146          if (Rmask == 0x0000FF00 &&
   1.147              Gmask == 0x00FF0000 &&
   1.148              Bmask == 0xFF000000 &&
   1.149              Amask == 0x000000FF) {
   1.150 -            return SDL_PIXELFORMAT_BGRA8888
   1.151 +            return SDL_PIXELFORMAT_BGRA8888;
   1.152          }
   1.153          if (Rmask == 0x3FF00000 &&
   1.154              Gmask == 0x000FFC00 &&
   1.155              Bmask == 0x000003FF &&
   1.156              Amask == 0xC0000000) {
   1.157 -            return SDL_PIXELFORMAT_ARGB2101010
   1.158 +            return SDL_PIXELFORMAT_ARGB2101010;
   1.159          }
   1.160      }
   1.161      return SDL_PIXELFORMAT_UNKNOWN;