src/video/SDL_blit_auto.c
changeset 8662 f8e55cba0bca
parent 8661 e9e62c8fffb6
child 9619 b94b6d0bff0f
     1.1 --- a/src/video/SDL_blit_auto.c	Fri Mar 21 00:57:43 2014 -0400
     1.2 +++ b/src/video/SDL_blit_auto.c	Fri Mar 21 10:40:15 2014 -0400
     1.3 @@ -71,8 +71,7 @@
     1.4      Uint32 srcpixel;
     1.5      Uint32 srcR, srcG, srcB, srcA;
     1.6      Uint32 dstpixel;
     1.7 -    Uint32 dstR, dstG, dstB, dstA;
     1.8 -    (void) dstA;  /* not all formats use alpha. */
     1.9 +    Uint32 dstR, dstG, dstB;
    1.10  
    1.11      while (info->dst_h--) {
    1.12          Uint32 *src = (Uint32 *)info->src;
    1.13 @@ -82,7 +81,7 @@
    1.14              srcpixel = *src;
    1.15              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
    1.16              dstpixel = *dst;
    1.17 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
    1.18 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
    1.19              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
    1.20                  /* This goes away if we ever use premultiplied alpha */
    1.21                  if (srcA < 255) {
    1.22 @@ -124,11 +123,10 @@
    1.23      Uint32 srcpixel;
    1.24      Uint32 srcR, srcG, srcB, srcA;
    1.25      Uint32 dstpixel;
    1.26 -    Uint32 dstR, dstG, dstB, dstA;
    1.27 +    Uint32 dstR, dstG, dstB;
    1.28      int srcy, srcx;
    1.29      int posy, posx;
    1.30      int incy, incx;
    1.31 -    (void) dstA;  /* not all formats use alpha. */
    1.32  
    1.33      srcy = 0;
    1.34      posy = 0;
    1.35 @@ -156,7 +154,7 @@
    1.36              srcpixel = *src;
    1.37              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
    1.38              dstpixel = *dst;
    1.39 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
    1.40 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
    1.41              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
    1.42                  /* This goes away if we ever use premultiplied alpha */
    1.43                  if (srcA < 255) {
    1.44 @@ -198,11 +196,8 @@
    1.45      const Uint32 modulateR = info->r;
    1.46      const Uint32 modulateG = info->g;
    1.47      const Uint32 modulateB = info->b;
    1.48 -    const Uint32 modulateA = info->a;
    1.49      Uint32 pixel;
    1.50 -    Uint32 R, G, B, A;
    1.51 -    (void) A;  /* not all formats use alpha. */
    1.52 -    (void) modulateA;  /* not all formats use alpha. */
    1.53 +    Uint32 R, G, B;
    1.54  
    1.55      while (info->dst_h--) {
    1.56          Uint32 *src = (Uint32 *)info->src;
    1.57 @@ -232,14 +227,11 @@
    1.58      const Uint32 modulateR = info->r;
    1.59      const Uint32 modulateG = info->g;
    1.60      const Uint32 modulateB = info->b;
    1.61 -    const Uint32 modulateA = info->a;
    1.62      Uint32 pixel;
    1.63 -    Uint32 R, G, B, A;
    1.64 +    Uint32 R, G, B;
    1.65      int srcy, srcx;
    1.66      int posy, posx;
    1.67      int incy, incx;
    1.68 -    (void) A;  /* not all formats use alpha. */
    1.69 -    (void) modulateA;  /* not all formats use alpha. */
    1.70  
    1.71      srcy = 0;
    1.72      posy = 0;
    1.73 @@ -291,9 +283,7 @@
    1.74      Uint32 srcpixel;
    1.75      Uint32 srcR, srcG, srcB, srcA;
    1.76      Uint32 dstpixel;
    1.77 -    Uint32 dstR, dstG, dstB, dstA;
    1.78 -    (void) modulateA;  /* not all formats use alpha. */
    1.79 -    (void) dstA;  /* not all formats use alpha. */
    1.80 +    Uint32 dstR, dstG, dstB;
    1.81  
    1.82      while (info->dst_h--) {
    1.83          Uint32 *src = (Uint32 *)info->src;
    1.84 @@ -303,7 +293,7 @@
    1.85              srcpixel = *src;
    1.86              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
    1.87              dstpixel = *dst;
    1.88 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
    1.89 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
    1.90              if (flags & SDL_COPY_MODULATE_COLOR) {
    1.91                  srcR = (srcR * modulateR) / 255;
    1.92                  srcG = (srcG * modulateG) / 255;
    1.93 @@ -357,12 +347,10 @@
    1.94      Uint32 srcpixel;
    1.95      Uint32 srcR, srcG, srcB, srcA;
    1.96      Uint32 dstpixel;
    1.97 -    Uint32 dstR, dstG, dstB, dstA;
    1.98 +    Uint32 dstR, dstG, dstB;
    1.99      int srcy, srcx;
   1.100      int posy, posx;
   1.101      int incy, incx;
   1.102 -    (void) modulateA;  /* not all formats use alpha. */
   1.103 -    (void) dstA;  /* not all formats use alpha. */
   1.104  
   1.105      srcy = 0;
   1.106      posy = 0;
   1.107 @@ -390,7 +378,7 @@
   1.108              srcpixel = *src;
   1.109              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
   1.110              dstpixel = *dst;
   1.111 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.112 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.113              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.114                  srcR = (srcR * modulateR) / 255;
   1.115                  srcG = (srcG * modulateG) / 255;
   1.116 @@ -437,11 +425,10 @@
   1.117  static void SDL_Blit_RGB888_BGR888_Scale(SDL_BlitInfo *info)
   1.118  {
   1.119      Uint32 pixel;
   1.120 -    Uint32 R, G, B, A;
   1.121 +    Uint32 R, G, B;
   1.122      int srcy, srcx;
   1.123      int posy, posx;
   1.124      int incy, incx;
   1.125 -    (void) A;  /* not all formats use alpha. */
   1.126  
   1.127      srcy = 0;
   1.128      posy = 0;
   1.129 @@ -484,8 +471,7 @@
   1.130      Uint32 srcpixel;
   1.131      Uint32 srcR, srcG, srcB, srcA;
   1.132      Uint32 dstpixel;
   1.133 -    Uint32 dstR, dstG, dstB, dstA;
   1.134 -    (void) dstA;  /* not all formats use alpha. */
   1.135 +    Uint32 dstR, dstG, dstB;
   1.136  
   1.137      while (info->dst_h--) {
   1.138          Uint32 *src = (Uint32 *)info->src;
   1.139 @@ -495,7 +481,7 @@
   1.140              srcpixel = *src;
   1.141              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
   1.142              dstpixel = *dst;
   1.143 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.144 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.145              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.146                  /* This goes away if we ever use premultiplied alpha */
   1.147                  if (srcA < 255) {
   1.148 @@ -537,11 +523,10 @@
   1.149      Uint32 srcpixel;
   1.150      Uint32 srcR, srcG, srcB, srcA;
   1.151      Uint32 dstpixel;
   1.152 -    Uint32 dstR, dstG, dstB, dstA;
   1.153 +    Uint32 dstR, dstG, dstB;
   1.154      int srcy, srcx;
   1.155      int posy, posx;
   1.156      int incy, incx;
   1.157 -    (void) dstA;  /* not all formats use alpha. */
   1.158  
   1.159      srcy = 0;
   1.160      posy = 0;
   1.161 @@ -569,7 +554,7 @@
   1.162              srcpixel = *src;
   1.163              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
   1.164              dstpixel = *dst;
   1.165 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.166 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.167              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.168                  /* This goes away if we ever use premultiplied alpha */
   1.169                  if (srcA < 255) {
   1.170 @@ -611,11 +596,8 @@
   1.171      const Uint32 modulateR = info->r;
   1.172      const Uint32 modulateG = info->g;
   1.173      const Uint32 modulateB = info->b;
   1.174 -    const Uint32 modulateA = info->a;
   1.175      Uint32 pixel;
   1.176 -    Uint32 R, G, B, A;
   1.177 -    (void) A;  /* not all formats use alpha. */
   1.178 -    (void) modulateA;  /* not all formats use alpha. */
   1.179 +    Uint32 R, G, B;
   1.180  
   1.181      while (info->dst_h--) {
   1.182          Uint32 *src = (Uint32 *)info->src;
   1.183 @@ -645,14 +627,11 @@
   1.184      const Uint32 modulateR = info->r;
   1.185      const Uint32 modulateG = info->g;
   1.186      const Uint32 modulateB = info->b;
   1.187 -    const Uint32 modulateA = info->a;
   1.188      Uint32 pixel;
   1.189 -    Uint32 R, G, B, A;
   1.190 +    Uint32 R, G, B;
   1.191      int srcy, srcx;
   1.192      int posy, posx;
   1.193      int incy, incx;
   1.194 -    (void) A;  /* not all formats use alpha. */
   1.195 -    (void) modulateA;  /* not all formats use alpha. */
   1.196  
   1.197      srcy = 0;
   1.198      posy = 0;
   1.199 @@ -704,9 +683,7 @@
   1.200      Uint32 srcpixel;
   1.201      Uint32 srcR, srcG, srcB, srcA;
   1.202      Uint32 dstpixel;
   1.203 -    Uint32 dstR, dstG, dstB, dstA;
   1.204 -    (void) modulateA;  /* not all formats use alpha. */
   1.205 -    (void) dstA;  /* not all formats use alpha. */
   1.206 +    Uint32 dstR, dstG, dstB;
   1.207  
   1.208      while (info->dst_h--) {
   1.209          Uint32 *src = (Uint32 *)info->src;
   1.210 @@ -716,7 +693,7 @@
   1.211              srcpixel = *src;
   1.212              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
   1.213              dstpixel = *dst;
   1.214 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.215 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.216              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.217                  srcR = (srcR * modulateR) / 255;
   1.218                  srcG = (srcG * modulateG) / 255;
   1.219 @@ -770,12 +747,10 @@
   1.220      Uint32 srcpixel;
   1.221      Uint32 srcR, srcG, srcB, srcA;
   1.222      Uint32 dstpixel;
   1.223 -    Uint32 dstR, dstG, dstB, dstA;
   1.224 +    Uint32 dstR, dstG, dstB;
   1.225      int srcy, srcx;
   1.226      int posy, posx;
   1.227      int incy, incx;
   1.228 -    (void) modulateA;  /* not all formats use alpha. */
   1.229 -    (void) dstA;  /* not all formats use alpha. */
   1.230  
   1.231      srcy = 0;
   1.232      posy = 0;
   1.233 @@ -803,7 +778,7 @@
   1.234              srcpixel = *src;
   1.235              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
   1.236              dstpixel = *dst;
   1.237 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.238 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.239              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.240                  srcR = (srcR * modulateR) / 255;
   1.241                  srcG = (srcG * modulateG) / 255;
   1.242 @@ -854,7 +829,6 @@
   1.243      int srcy, srcx;
   1.244      int posy, posx;
   1.245      int incy, incx;
   1.246 -    (void) A;  /* not all formats use alpha. */
   1.247  
   1.248      srcy = 0;
   1.249      posy = 0;
   1.250 @@ -898,7 +872,6 @@
   1.251      Uint32 srcR, srcG, srcB, srcA;
   1.252      Uint32 dstpixel;
   1.253      Uint32 dstR, dstG, dstB, dstA;
   1.254 -    (void) dstA;  /* not all formats use alpha. */
   1.255  
   1.256      while (info->dst_h--) {
   1.257          Uint32 *src = (Uint32 *)info->src;
   1.258 @@ -955,7 +928,6 @@
   1.259      int srcy, srcx;
   1.260      int posy, posx;
   1.261      int incy, incx;
   1.262 -    (void) dstA;  /* not all formats use alpha. */
   1.263  
   1.264      srcy = 0;
   1.265      posy = 0;
   1.266 @@ -1029,8 +1001,6 @@
   1.267      const Uint32 modulateA = info->a;
   1.268      Uint32 pixel;
   1.269      Uint32 R, G, B, A;
   1.270 -    (void) A;  /* not all formats use alpha. */
   1.271 -    (void) modulateA;  /* not all formats use alpha. */
   1.272  
   1.273      while (info->dst_h--) {
   1.274          Uint32 *src = (Uint32 *)info->src;
   1.275 @@ -1069,8 +1039,6 @@
   1.276      int srcy, srcx;
   1.277      int posy, posx;
   1.278      int incy, incx;
   1.279 -    (void) A;  /* not all formats use alpha. */
   1.280 -    (void) modulateA;  /* not all formats use alpha. */
   1.281  
   1.282      srcy = 0;
   1.283      posy = 0;
   1.284 @@ -1126,8 +1094,6 @@
   1.285      Uint32 srcR, srcG, srcB, srcA;
   1.286      Uint32 dstpixel;
   1.287      Uint32 dstR, dstG, dstB, dstA;
   1.288 -    (void) modulateA;  /* not all formats use alpha. */
   1.289 -    (void) dstA;  /* not all formats use alpha. */
   1.290  
   1.291      while (info->dst_h--) {
   1.292          Uint32 *src = (Uint32 *)info->src;
   1.293 @@ -1196,8 +1162,6 @@
   1.294      int srcy, srcx;
   1.295      int posy, posx;
   1.296      int incy, incx;
   1.297 -    (void) modulateA;  /* not all formats use alpha. */
   1.298 -    (void) dstA;  /* not all formats use alpha. */
   1.299  
   1.300      srcy = 0;
   1.301      posy = 0;
   1.302 @@ -1273,11 +1237,10 @@
   1.303  static void SDL_Blit_BGR888_RGB888_Scale(SDL_BlitInfo *info)
   1.304  {
   1.305      Uint32 pixel;
   1.306 -    Uint32 R, G, B, A;
   1.307 +    Uint32 R, G, B;
   1.308      int srcy, srcx;
   1.309      int posy, posx;
   1.310      int incy, incx;
   1.311 -    (void) A;  /* not all formats use alpha. */
   1.312  
   1.313      srcy = 0;
   1.314      posy = 0;
   1.315 @@ -1320,8 +1283,7 @@
   1.316      Uint32 srcpixel;
   1.317      Uint32 srcR, srcG, srcB, srcA;
   1.318      Uint32 dstpixel;
   1.319 -    Uint32 dstR, dstG, dstB, dstA;
   1.320 -    (void) dstA;  /* not all formats use alpha. */
   1.321 +    Uint32 dstR, dstG, dstB;
   1.322  
   1.323      while (info->dst_h--) {
   1.324          Uint32 *src = (Uint32 *)info->src;
   1.325 @@ -1331,7 +1293,7 @@
   1.326              srcpixel = *src;
   1.327              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
   1.328              dstpixel = *dst;
   1.329 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.330 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.331              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.332                  /* This goes away if we ever use premultiplied alpha */
   1.333                  if (srcA < 255) {
   1.334 @@ -1373,11 +1335,10 @@
   1.335      Uint32 srcpixel;
   1.336      Uint32 srcR, srcG, srcB, srcA;
   1.337      Uint32 dstpixel;
   1.338 -    Uint32 dstR, dstG, dstB, dstA;
   1.339 +    Uint32 dstR, dstG, dstB;
   1.340      int srcy, srcx;
   1.341      int posy, posx;
   1.342      int incy, incx;
   1.343 -    (void) dstA;  /* not all formats use alpha. */
   1.344  
   1.345      srcy = 0;
   1.346      posy = 0;
   1.347 @@ -1405,7 +1366,7 @@
   1.348              srcpixel = *src;
   1.349              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
   1.350              dstpixel = *dst;
   1.351 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.352 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.353              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.354                  /* This goes away if we ever use premultiplied alpha */
   1.355                  if (srcA < 255) {
   1.356 @@ -1447,11 +1408,8 @@
   1.357      const Uint32 modulateR = info->r;
   1.358      const Uint32 modulateG = info->g;
   1.359      const Uint32 modulateB = info->b;
   1.360 -    const Uint32 modulateA = info->a;
   1.361      Uint32 pixel;
   1.362 -    Uint32 R, G, B, A;
   1.363 -    (void) A;  /* not all formats use alpha. */
   1.364 -    (void) modulateA;  /* not all formats use alpha. */
   1.365 +    Uint32 R, G, B;
   1.366  
   1.367      while (info->dst_h--) {
   1.368          Uint32 *src = (Uint32 *)info->src;
   1.369 @@ -1481,14 +1439,11 @@
   1.370      const Uint32 modulateR = info->r;
   1.371      const Uint32 modulateG = info->g;
   1.372      const Uint32 modulateB = info->b;
   1.373 -    const Uint32 modulateA = info->a;
   1.374      Uint32 pixel;
   1.375 -    Uint32 R, G, B, A;
   1.376 +    Uint32 R, G, B;
   1.377      int srcy, srcx;
   1.378      int posy, posx;
   1.379      int incy, incx;
   1.380 -    (void) A;  /* not all formats use alpha. */
   1.381 -    (void) modulateA;  /* not all formats use alpha. */
   1.382  
   1.383      srcy = 0;
   1.384      posy = 0;
   1.385 @@ -1540,9 +1495,7 @@
   1.386      Uint32 srcpixel;
   1.387      Uint32 srcR, srcG, srcB, srcA;
   1.388      Uint32 dstpixel;
   1.389 -    Uint32 dstR, dstG, dstB, dstA;
   1.390 -    (void) modulateA;  /* not all formats use alpha. */
   1.391 -    (void) dstA;  /* not all formats use alpha. */
   1.392 +    Uint32 dstR, dstG, dstB;
   1.393  
   1.394      while (info->dst_h--) {
   1.395          Uint32 *src = (Uint32 *)info->src;
   1.396 @@ -1552,7 +1505,7 @@
   1.397              srcpixel = *src;
   1.398              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
   1.399              dstpixel = *dst;
   1.400 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.401 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.402              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.403                  srcR = (srcR * modulateR) / 255;
   1.404                  srcG = (srcG * modulateG) / 255;
   1.405 @@ -1606,12 +1559,10 @@
   1.406      Uint32 srcpixel;
   1.407      Uint32 srcR, srcG, srcB, srcA;
   1.408      Uint32 dstpixel;
   1.409 -    Uint32 dstR, dstG, dstB, dstA;
   1.410 +    Uint32 dstR, dstG, dstB;
   1.411      int srcy, srcx;
   1.412      int posy, posx;
   1.413      int incy, incx;
   1.414 -    (void) modulateA;  /* not all formats use alpha. */
   1.415 -    (void) dstA;  /* not all formats use alpha. */
   1.416  
   1.417      srcy = 0;
   1.418      posy = 0;
   1.419 @@ -1639,7 +1590,7 @@
   1.420              srcpixel = *src;
   1.421              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
   1.422              dstpixel = *dst;
   1.423 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.424 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.425              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.426                  srcR = (srcR * modulateR) / 255;
   1.427                  srcG = (srcG * modulateG) / 255;
   1.428 @@ -1727,8 +1678,7 @@
   1.429      Uint32 srcpixel;
   1.430      Uint32 srcR, srcG, srcB, srcA;
   1.431      Uint32 dstpixel;
   1.432 -    Uint32 dstR, dstG, dstB, dstA;
   1.433 -    (void) dstA;  /* not all formats use alpha. */
   1.434 +    Uint32 dstR, dstG, dstB;
   1.435  
   1.436      while (info->dst_h--) {
   1.437          Uint32 *src = (Uint32 *)info->src;
   1.438 @@ -1738,7 +1688,7 @@
   1.439              srcpixel = *src;
   1.440              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
   1.441              dstpixel = *dst;
   1.442 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.443 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.444              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.445                  /* This goes away if we ever use premultiplied alpha */
   1.446                  if (srcA < 255) {
   1.447 @@ -1780,11 +1730,10 @@
   1.448      Uint32 srcpixel;
   1.449      Uint32 srcR, srcG, srcB, srcA;
   1.450      Uint32 dstpixel;
   1.451 -    Uint32 dstR, dstG, dstB, dstA;
   1.452 +    Uint32 dstR, dstG, dstB;
   1.453      int srcy, srcx;
   1.454      int posy, posx;
   1.455      int incy, incx;
   1.456 -    (void) dstA;  /* not all formats use alpha. */
   1.457  
   1.458      srcy = 0;
   1.459      posy = 0;
   1.460 @@ -1812,7 +1761,7 @@
   1.461              srcpixel = *src;
   1.462              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
   1.463              dstpixel = *dst;
   1.464 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.465 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.466              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.467                  /* This goes away if we ever use premultiplied alpha */
   1.468                  if (srcA < 255) {
   1.469 @@ -1854,11 +1803,8 @@
   1.470      const Uint32 modulateR = info->r;
   1.471      const Uint32 modulateG = info->g;
   1.472      const Uint32 modulateB = info->b;
   1.473 -    const Uint32 modulateA = info->a;
   1.474      Uint32 pixel;
   1.475 -    Uint32 R, G, B, A;
   1.476 -    (void) A;  /* not all formats use alpha. */
   1.477 -    (void) modulateA;  /* not all formats use alpha. */
   1.478 +    Uint32 R, G, B;
   1.479  
   1.480      while (info->dst_h--) {
   1.481          Uint32 *src = (Uint32 *)info->src;
   1.482 @@ -1888,14 +1834,11 @@
   1.483      const Uint32 modulateR = info->r;
   1.484      const Uint32 modulateG = info->g;
   1.485      const Uint32 modulateB = info->b;
   1.486 -    const Uint32 modulateA = info->a;
   1.487      Uint32 pixel;
   1.488 -    Uint32 R, G, B, A;
   1.489 +    Uint32 R, G, B;
   1.490      int srcy, srcx;
   1.491      int posy, posx;
   1.492      int incy, incx;
   1.493 -    (void) A;  /* not all formats use alpha. */
   1.494 -    (void) modulateA;  /* not all formats use alpha. */
   1.495  
   1.496      srcy = 0;
   1.497      posy = 0;
   1.498 @@ -1947,9 +1890,7 @@
   1.499      Uint32 srcpixel;
   1.500      Uint32 srcR, srcG, srcB, srcA;
   1.501      Uint32 dstpixel;
   1.502 -    Uint32 dstR, dstG, dstB, dstA;
   1.503 -    (void) modulateA;  /* not all formats use alpha. */
   1.504 -    (void) dstA;  /* not all formats use alpha. */
   1.505 +    Uint32 dstR, dstG, dstB;
   1.506  
   1.507      while (info->dst_h--) {
   1.508          Uint32 *src = (Uint32 *)info->src;
   1.509 @@ -1959,7 +1900,7 @@
   1.510              srcpixel = *src;
   1.511              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
   1.512              dstpixel = *dst;
   1.513 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.514 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.515              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.516                  srcR = (srcR * modulateR) / 255;
   1.517                  srcG = (srcG * modulateG) / 255;
   1.518 @@ -2013,12 +1954,10 @@
   1.519      Uint32 srcpixel;
   1.520      Uint32 srcR, srcG, srcB, srcA;
   1.521      Uint32 dstpixel;
   1.522 -    Uint32 dstR, dstG, dstB, dstA;
   1.523 +    Uint32 dstR, dstG, dstB;
   1.524      int srcy, srcx;
   1.525      int posy, posx;
   1.526      int incy, incx;
   1.527 -    (void) modulateA;  /* not all formats use alpha. */
   1.528 -    (void) dstA;  /* not all formats use alpha. */
   1.529  
   1.530      srcy = 0;
   1.531      posy = 0;
   1.532 @@ -2046,7 +1985,7 @@
   1.533              srcpixel = *src;
   1.534              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
   1.535              dstpixel = *dst;
   1.536 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.537 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.538              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.539                  srcR = (srcR * modulateR) / 255;
   1.540                  srcG = (srcG * modulateG) / 255;
   1.541 @@ -2097,7 +2036,6 @@
   1.542      int srcy, srcx;
   1.543      int posy, posx;
   1.544      int incy, incx;
   1.545 -    (void) A;  /* not all formats use alpha. */
   1.546  
   1.547      srcy = 0;
   1.548      posy = 0;
   1.549 @@ -2141,7 +2079,6 @@
   1.550      Uint32 srcR, srcG, srcB, srcA;
   1.551      Uint32 dstpixel;
   1.552      Uint32 dstR, dstG, dstB, dstA;
   1.553 -    (void) dstA;  /* not all formats use alpha. */
   1.554  
   1.555      while (info->dst_h--) {
   1.556          Uint32 *src = (Uint32 *)info->src;
   1.557 @@ -2198,7 +2135,6 @@
   1.558      int srcy, srcx;
   1.559      int posy, posx;
   1.560      int incy, incx;
   1.561 -    (void) dstA;  /* not all formats use alpha. */
   1.562  
   1.563      srcy = 0;
   1.564      posy = 0;
   1.565 @@ -2272,8 +2208,6 @@
   1.566      const Uint32 modulateA = info->a;
   1.567      Uint32 pixel;
   1.568      Uint32 R, G, B, A;
   1.569 -    (void) A;  /* not all formats use alpha. */
   1.570 -    (void) modulateA;  /* not all formats use alpha. */
   1.571  
   1.572      while (info->dst_h--) {
   1.573          Uint32 *src = (Uint32 *)info->src;
   1.574 @@ -2312,8 +2246,6 @@
   1.575      int srcy, srcx;
   1.576      int posy, posx;
   1.577      int incy, incx;
   1.578 -    (void) A;  /* not all formats use alpha. */
   1.579 -    (void) modulateA;  /* not all formats use alpha. */
   1.580  
   1.581      srcy = 0;
   1.582      posy = 0;
   1.583 @@ -2369,8 +2301,6 @@
   1.584      Uint32 srcR, srcG, srcB, srcA;
   1.585      Uint32 dstpixel;
   1.586      Uint32 dstR, dstG, dstB, dstA;
   1.587 -    (void) modulateA;  /* not all formats use alpha. */
   1.588 -    (void) dstA;  /* not all formats use alpha. */
   1.589  
   1.590      while (info->dst_h--) {
   1.591          Uint32 *src = (Uint32 *)info->src;
   1.592 @@ -2439,8 +2369,6 @@
   1.593      int srcy, srcx;
   1.594      int posy, posx;
   1.595      int incy, incx;
   1.596 -    (void) modulateA;  /* not all formats use alpha. */
   1.597 -    (void) dstA;  /* not all formats use alpha. */
   1.598  
   1.599      srcy = 0;
   1.600      posy = 0;
   1.601 @@ -2516,11 +2444,10 @@
   1.602  static void SDL_Blit_ARGB8888_RGB888_Scale(SDL_BlitInfo *info)
   1.603  {
   1.604      Uint32 pixel;
   1.605 -    Uint32 R, G, B, A;
   1.606 +    Uint32 R, G, B;
   1.607      int srcy, srcx;
   1.608      int posy, posx;
   1.609      int incy, incx;
   1.610 -    (void) A;  /* not all formats use alpha. */
   1.611  
   1.612      srcy = 0;
   1.613      posy = 0;
   1.614 @@ -2563,8 +2490,7 @@
   1.615      Uint32 srcpixel;
   1.616      Uint32 srcR, srcG, srcB, srcA;
   1.617      Uint32 dstpixel;
   1.618 -    Uint32 dstR, dstG, dstB, dstA;
   1.619 -    (void) dstA;  /* not all formats use alpha. */
   1.620 +    Uint32 dstR, dstG, dstB;
   1.621  
   1.622      while (info->dst_h--) {
   1.623          Uint32 *src = (Uint32 *)info->src;
   1.624 @@ -2574,7 +2500,7 @@
   1.625              srcpixel = *src;
   1.626              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
   1.627              dstpixel = *dst;
   1.628 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.629 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.630              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.631                  /* This goes away if we ever use premultiplied alpha */
   1.632                  if (srcA < 255) {
   1.633 @@ -2616,11 +2542,10 @@
   1.634      Uint32 srcpixel;
   1.635      Uint32 srcR, srcG, srcB, srcA;
   1.636      Uint32 dstpixel;
   1.637 -    Uint32 dstR, dstG, dstB, dstA;
   1.638 +    Uint32 dstR, dstG, dstB;
   1.639      int srcy, srcx;
   1.640      int posy, posx;
   1.641      int incy, incx;
   1.642 -    (void) dstA;  /* not all formats use alpha. */
   1.643  
   1.644      srcy = 0;
   1.645      posy = 0;
   1.646 @@ -2648,7 +2573,7 @@
   1.647              srcpixel = *src;
   1.648              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
   1.649              dstpixel = *dst;
   1.650 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.651 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.652              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.653                  /* This goes away if we ever use premultiplied alpha */
   1.654                  if (srcA < 255) {
   1.655 @@ -2690,11 +2615,8 @@
   1.656      const Uint32 modulateR = info->r;
   1.657      const Uint32 modulateG = info->g;
   1.658      const Uint32 modulateB = info->b;
   1.659 -    const Uint32 modulateA = info->a;
   1.660      Uint32 pixel;
   1.661 -    Uint32 R, G, B, A;
   1.662 -    (void) A;  /* not all formats use alpha. */
   1.663 -    (void) modulateA;  /* not all formats use alpha. */
   1.664 +    Uint32 R, G, B;
   1.665  
   1.666      while (info->dst_h--) {
   1.667          Uint32 *src = (Uint32 *)info->src;
   1.668 @@ -2724,14 +2646,11 @@
   1.669      const Uint32 modulateR = info->r;
   1.670      const Uint32 modulateG = info->g;
   1.671      const Uint32 modulateB = info->b;
   1.672 -    const Uint32 modulateA = info->a;
   1.673      Uint32 pixel;
   1.674 -    Uint32 R, G, B, A;
   1.675 +    Uint32 R, G, B;
   1.676      int srcy, srcx;
   1.677      int posy, posx;
   1.678      int incy, incx;
   1.679 -    (void) A;  /* not all formats use alpha. */
   1.680 -    (void) modulateA;  /* not all formats use alpha. */
   1.681  
   1.682      srcy = 0;
   1.683      posy = 0;
   1.684 @@ -2783,9 +2702,7 @@
   1.685      Uint32 srcpixel;
   1.686      Uint32 srcR, srcG, srcB, srcA;
   1.687      Uint32 dstpixel;
   1.688 -    Uint32 dstR, dstG, dstB, dstA;
   1.689 -    (void) modulateA;  /* not all formats use alpha. */
   1.690 -    (void) dstA;  /* not all formats use alpha. */
   1.691 +    Uint32 dstR, dstG, dstB;
   1.692  
   1.693      while (info->dst_h--) {
   1.694          Uint32 *src = (Uint32 *)info->src;
   1.695 @@ -2795,7 +2712,7 @@
   1.696              srcpixel = *src;
   1.697              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
   1.698              dstpixel = *dst;
   1.699 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.700 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.701              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.702                  srcR = (srcR * modulateR) / 255;
   1.703                  srcG = (srcG * modulateG) / 255;
   1.704 @@ -2849,12 +2766,10 @@
   1.705      Uint32 srcpixel;
   1.706      Uint32 srcR, srcG, srcB, srcA;
   1.707      Uint32 dstpixel;
   1.708 -    Uint32 dstR, dstG, dstB, dstA;
   1.709 +    Uint32 dstR, dstG, dstB;
   1.710      int srcy, srcx;
   1.711      int posy, posx;
   1.712      int incy, incx;
   1.713 -    (void) modulateA;  /* not all formats use alpha. */
   1.714 -    (void) dstA;  /* not all formats use alpha. */
   1.715  
   1.716      srcy = 0;
   1.717      posy = 0;
   1.718 @@ -2882,7 +2797,7 @@
   1.719              srcpixel = *src;
   1.720              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
   1.721              dstpixel = *dst;
   1.722 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.723 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.724              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.725                  srcR = (srcR * modulateR) / 255;
   1.726                  srcG = (srcG * modulateG) / 255;
   1.727 @@ -2929,11 +2844,10 @@
   1.728  static void SDL_Blit_ARGB8888_BGR888_Scale(SDL_BlitInfo *info)
   1.729  {
   1.730      Uint32 pixel;
   1.731 -    Uint32 R, G, B, A;
   1.732 +    Uint32 R, G, B;
   1.733      int srcy, srcx;
   1.734      int posy, posx;
   1.735      int incy, incx;
   1.736 -    (void) A;  /* not all formats use alpha. */
   1.737  
   1.738      srcy = 0;
   1.739      posy = 0;
   1.740 @@ -2976,8 +2890,7 @@
   1.741      Uint32 srcpixel;
   1.742      Uint32 srcR, srcG, srcB, srcA;
   1.743      Uint32 dstpixel;
   1.744 -    Uint32 dstR, dstG, dstB, dstA;
   1.745 -    (void) dstA;  /* not all formats use alpha. */
   1.746 +    Uint32 dstR, dstG, dstB;
   1.747  
   1.748      while (info->dst_h--) {
   1.749          Uint32 *src = (Uint32 *)info->src;
   1.750 @@ -2987,7 +2900,7 @@
   1.751              srcpixel = *src;
   1.752              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
   1.753              dstpixel = *dst;
   1.754 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.755 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.756              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.757                  /* This goes away if we ever use premultiplied alpha */
   1.758                  if (srcA < 255) {
   1.759 @@ -3029,11 +2942,10 @@
   1.760      Uint32 srcpixel;
   1.761      Uint32 srcR, srcG, srcB, srcA;
   1.762      Uint32 dstpixel;
   1.763 -    Uint32 dstR, dstG, dstB, dstA;
   1.764 +    Uint32 dstR, dstG, dstB;
   1.765      int srcy, srcx;
   1.766      int posy, posx;
   1.767      int incy, incx;
   1.768 -    (void) dstA;  /* not all formats use alpha. */
   1.769  
   1.770      srcy = 0;
   1.771      posy = 0;
   1.772 @@ -3061,7 +2973,7 @@
   1.773              srcpixel = *src;
   1.774              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
   1.775              dstpixel = *dst;
   1.776 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.777 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.778              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.779                  /* This goes away if we ever use premultiplied alpha */
   1.780                  if (srcA < 255) {
   1.781 @@ -3103,11 +3015,8 @@
   1.782      const Uint32 modulateR = info->r;
   1.783      const Uint32 modulateG = info->g;
   1.784      const Uint32 modulateB = info->b;
   1.785 -    const Uint32 modulateA = info->a;
   1.786      Uint32 pixel;
   1.787 -    Uint32 R, G, B, A;
   1.788 -    (void) A;  /* not all formats use alpha. */
   1.789 -    (void) modulateA;  /* not all formats use alpha. */
   1.790 +    Uint32 R, G, B;
   1.791  
   1.792      while (info->dst_h--) {
   1.793          Uint32 *src = (Uint32 *)info->src;
   1.794 @@ -3137,14 +3046,11 @@
   1.795      const Uint32 modulateR = info->r;
   1.796      const Uint32 modulateG = info->g;
   1.797      const Uint32 modulateB = info->b;
   1.798 -    const Uint32 modulateA = info->a;
   1.799      Uint32 pixel;
   1.800 -    Uint32 R, G, B, A;
   1.801 +    Uint32 R, G, B;
   1.802      int srcy, srcx;
   1.803      int posy, posx;
   1.804      int incy, incx;
   1.805 -    (void) A;  /* not all formats use alpha. */
   1.806 -    (void) modulateA;  /* not all formats use alpha. */
   1.807  
   1.808      srcy = 0;
   1.809      posy = 0;
   1.810 @@ -3196,9 +3102,7 @@
   1.811      Uint32 srcpixel;
   1.812      Uint32 srcR, srcG, srcB, srcA;
   1.813      Uint32 dstpixel;
   1.814 -    Uint32 dstR, dstG, dstB, dstA;
   1.815 -    (void) modulateA;  /* not all formats use alpha. */
   1.816 -    (void) dstA;  /* not all formats use alpha. */
   1.817 +    Uint32 dstR, dstG, dstB;
   1.818  
   1.819      while (info->dst_h--) {
   1.820          Uint32 *src = (Uint32 *)info->src;
   1.821 @@ -3208,7 +3112,7 @@
   1.822              srcpixel = *src;
   1.823              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
   1.824              dstpixel = *dst;
   1.825 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.826 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.827              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.828                  srcR = (srcR * modulateR) / 255;
   1.829                  srcG = (srcG * modulateG) / 255;
   1.830 @@ -3262,12 +3166,10 @@
   1.831      Uint32 srcpixel;
   1.832      Uint32 srcR, srcG, srcB, srcA;
   1.833      Uint32 dstpixel;
   1.834 -    Uint32 dstR, dstG, dstB, dstA;
   1.835 +    Uint32 dstR, dstG, dstB;
   1.836      int srcy, srcx;
   1.837      int posy, posx;
   1.838      int incy, incx;
   1.839 -    (void) modulateA;  /* not all formats use alpha. */
   1.840 -    (void) dstA;  /* not all formats use alpha. */
   1.841  
   1.842      srcy = 0;
   1.843      posy = 0;
   1.844 @@ -3295,7 +3197,7 @@
   1.845              srcpixel = *src;
   1.846              srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
   1.847              dstpixel = *dst;
   1.848 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
   1.849 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
   1.850              if (flags & SDL_COPY_MODULATE_COLOR) {
   1.851                  srcR = (srcR * modulateR) / 255;
   1.852                  srcG = (srcG * modulateG) / 255;
   1.853 @@ -3384,7 +3286,6 @@
   1.854      Uint32 srcR, srcG, srcB, srcA;
   1.855      Uint32 dstpixel;
   1.856      Uint32 dstR, dstG, dstB, dstA;
   1.857 -    (void) dstA;  /* not all formats use alpha. */
   1.858  
   1.859      while (info->dst_h--) {
   1.860          Uint32 *src = (Uint32 *)info->src;
   1.861 @@ -3441,7 +3342,6 @@
   1.862      int srcy, srcx;
   1.863      int posy, posx;
   1.864      int incy, incx;
   1.865 -    (void) dstA;  /* not all formats use alpha. */
   1.866  
   1.867      srcy = 0;
   1.868      posy = 0;
   1.869 @@ -3515,8 +3415,6 @@
   1.870      const Uint32 modulateA = info->a;
   1.871      Uint32 pixel;
   1.872      Uint32 R, G, B, A;
   1.873 -    (void) A;  /* not all formats use alpha. */
   1.874 -    (void) modulateA;  /* not all formats use alpha. */
   1.875  
   1.876      while (info->dst_h--) {
   1.877          Uint32 *src = (Uint32 *)info->src;
   1.878 @@ -3555,8 +3453,6 @@
   1.879      int srcy, srcx;
   1.880      int posy, posx;
   1.881      int incy, incx;
   1.882 -    (void) A;  /* not all formats use alpha. */
   1.883 -    (void) modulateA;  /* not all formats use alpha. */
   1.884  
   1.885      srcy = 0;
   1.886      posy = 0;
   1.887 @@ -3612,8 +3508,6 @@
   1.888      Uint32 srcR, srcG, srcB, srcA;
   1.889      Uint32 dstpixel;
   1.890      Uint32 dstR, dstG, dstB, dstA;
   1.891 -    (void) modulateA;  /* not all formats use alpha. */
   1.892 -    (void) dstA;  /* not all formats use alpha. */
   1.893  
   1.894      while (info->dst_h--) {
   1.895          Uint32 *src = (Uint32 *)info->src;
   1.896 @@ -3682,8 +3576,6 @@
   1.897      int srcy, srcx;
   1.898      int posy, posx;
   1.899      int incy, incx;
   1.900 -    (void) modulateA;  /* not all formats use alpha. */
   1.901 -    (void) dstA;  /* not all formats use alpha. */
   1.902  
   1.903      srcy = 0;
   1.904      posy = 0;
   1.905 @@ -3759,11 +3651,10 @@
   1.906  static void SDL_Blit_RGBA8888_RGB888_Scale(SDL_BlitInfo *info)
   1.907  {
   1.908      Uint32 pixel;
   1.909 -    Uint32 R, G, B, A;
   1.910 +    Uint32 R, G, B;
   1.911      int srcy, srcx;
   1.912      int posy, posx;
   1.913      int incy, incx;
   1.914 -    (void) A;  /* not all formats use alpha. */
   1.915  
   1.916      srcy = 0;
   1.917      posy = 0;
   1.918 @@ -3806,8 +3697,7 @@
   1.919      Uint32 srcpixel;
   1.920      Uint32 srcR, srcG, srcB, srcA;
   1.921      Uint32 dstpixel;
   1.922 -    Uint32 dstR, dstG, dstB, dstA;
   1.923 -    (void) dstA;  /* not all formats use alpha. */
   1.924 +    Uint32 dstR, dstG, dstB;
   1.925  
   1.926      while (info->dst_h--) {
   1.927          Uint32 *src = (Uint32 *)info->src;
   1.928 @@ -3817,7 +3707,7 @@
   1.929              srcpixel = *src;
   1.930              srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
   1.931              dstpixel = *dst;
   1.932 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.933 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.934              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.935                  /* This goes away if we ever use premultiplied alpha */
   1.936                  if (srcA < 255) {
   1.937 @@ -3859,11 +3749,10 @@
   1.938      Uint32 srcpixel;
   1.939      Uint32 srcR, srcG, srcB, srcA;
   1.940      Uint32 dstpixel;
   1.941 -    Uint32 dstR, dstG, dstB, dstA;
   1.942 +    Uint32 dstR, dstG, dstB;
   1.943      int srcy, srcx;
   1.944      int posy, posx;
   1.945      int incy, incx;
   1.946 -    (void) dstA;  /* not all formats use alpha. */
   1.947  
   1.948      srcy = 0;
   1.949      posy = 0;
   1.950 @@ -3891,7 +3780,7 @@
   1.951              srcpixel = *src;
   1.952              srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
   1.953              dstpixel = *dst;
   1.954 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
   1.955 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
   1.956              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
   1.957                  /* This goes away if we ever use premultiplied alpha */
   1.958                  if (srcA < 255) {
   1.959 @@ -3933,11 +3822,8 @@
   1.960      const Uint32 modulateR = info->r;
   1.961      const Uint32 modulateG = info->g;
   1.962      const Uint32 modulateB = info->b;
   1.963 -    const Uint32 modulateA = info->a;
   1.964      Uint32 pixel;
   1.965 -    Uint32 R, G, B, A;
   1.966 -    (void) A;  /* not all formats use alpha. */
   1.967 -    (void) modulateA;  /* not all formats use alpha. */
   1.968 +    Uint32 R, G, B;
   1.969  
   1.970      while (info->dst_h--) {
   1.971          Uint32 *src = (Uint32 *)info->src;
   1.972 @@ -3967,14 +3853,11 @@
   1.973      const Uint32 modulateR = info->r;
   1.974      const Uint32 modulateG = info->g;
   1.975      const Uint32 modulateB = info->b;
   1.976 -    const Uint32 modulateA = info->a;
   1.977      Uint32 pixel;
   1.978 -    Uint32 R, G, B, A;
   1.979 +    Uint32 R, G, B;
   1.980      int srcy, srcx;
   1.981      int posy, posx;
   1.982      int incy, incx;
   1.983 -    (void) A;  /* not all formats use alpha. */
   1.984 -    (void) modulateA;  /* not all formats use alpha. */
   1.985  
   1.986      srcy = 0;
   1.987      posy = 0;
   1.988 @@ -4026,9 +3909,7 @@
   1.989      Uint32 srcpixel;
   1.990      Uint32 srcR, srcG, srcB, srcA;
   1.991      Uint32 dstpixel;
   1.992 -    Uint32 dstR, dstG, dstB, dstA;
   1.993 -    (void) modulateA;  /* not all formats use alpha. */
   1.994 -    (void) dstA;  /* not all formats use alpha. */
   1.995 +    Uint32 dstR, dstG, dstB;
   1.996  
   1.997      while (info->dst_h--) {
   1.998          Uint32 *src = (Uint32 *)info->src;
   1.999 @@ -4038,7 +3919,7 @@
  1.1000              srcpixel = *src;
  1.1001              srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1002              dstpixel = *dst;
  1.1003 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
  1.1004 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
  1.1005              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1006                  srcR = (srcR * modulateR) / 255;
  1.1007                  srcG = (srcG * modulateG) / 255;
  1.1008 @@ -4092,12 +3973,10 @@
  1.1009      Uint32 srcpixel;
  1.1010      Uint32 srcR, srcG, srcB, srcA;
  1.1011      Uint32 dstpixel;
  1.1012 -    Uint32 dstR, dstG, dstB, dstA;
  1.1013 +    Uint32 dstR, dstG, dstB;
  1.1014      int srcy, srcx;
  1.1015      int posy, posx;
  1.1016      int incy, incx;
  1.1017 -    (void) modulateA;  /* not all formats use alpha. */
  1.1018 -    (void) dstA;  /* not all formats use alpha. */
  1.1019  
  1.1020      srcy = 0;
  1.1021      posy = 0;
  1.1022 @@ -4125,7 +4004,7 @@
  1.1023              srcpixel = *src;
  1.1024              srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1025              dstpixel = *dst;
  1.1026 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
  1.1027 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
  1.1028              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1029                  srcR = (srcR * modulateR) / 255;
  1.1030                  srcG = (srcG * modulateG) / 255;
  1.1031 @@ -4172,11 +4051,10 @@
  1.1032  static void SDL_Blit_RGBA8888_BGR888_Scale(SDL_BlitInfo *info)
  1.1033  {
  1.1034      Uint32 pixel;
  1.1035 -    Uint32 R, G, B, A;
  1.1036 +    Uint32 R, G, B;
  1.1037      int srcy, srcx;
  1.1038      int posy, posx;
  1.1039      int incy, incx;
  1.1040 -    (void) A;  /* not all formats use alpha. */
  1.1041  
  1.1042      srcy = 0;
  1.1043      posy = 0;
  1.1044 @@ -4219,8 +4097,7 @@
  1.1045      Uint32 srcpixel;
  1.1046      Uint32 srcR, srcG, srcB, srcA;
  1.1047      Uint32 dstpixel;
  1.1048 -    Uint32 dstR, dstG, dstB, dstA;
  1.1049 -    (void) dstA;  /* not all formats use alpha. */
  1.1050 +    Uint32 dstR, dstG, dstB;
  1.1051  
  1.1052      while (info->dst_h--) {
  1.1053          Uint32 *src = (Uint32 *)info->src;
  1.1054 @@ -4230,7 +4107,7 @@
  1.1055              srcpixel = *src;
  1.1056              srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1057              dstpixel = *dst;
  1.1058 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1059 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1060              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
  1.1061                  /* This goes away if we ever use premultiplied alpha */
  1.1062                  if (srcA < 255) {
  1.1063 @@ -4272,11 +4149,10 @@
  1.1064      Uint32 srcpixel;
  1.1065      Uint32 srcR, srcG, srcB, srcA;
  1.1066      Uint32 dstpixel;
  1.1067 -    Uint32 dstR, dstG, dstB, dstA;
  1.1068 +    Uint32 dstR, dstG, dstB;
  1.1069      int srcy, srcx;
  1.1070      int posy, posx;
  1.1071      int incy, incx;
  1.1072 -    (void) dstA;  /* not all formats use alpha. */
  1.1073  
  1.1074      srcy = 0;
  1.1075      posy = 0;
  1.1076 @@ -4304,7 +4180,7 @@
  1.1077              srcpixel = *src;
  1.1078              srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1079              dstpixel = *dst;
  1.1080 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1081 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1082              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
  1.1083                  /* This goes away if we ever use premultiplied alpha */
  1.1084                  if (srcA < 255) {
  1.1085 @@ -4346,11 +4222,8 @@
  1.1086      const Uint32 modulateR = info->r;
  1.1087      const Uint32 modulateG = info->g;
  1.1088      const Uint32 modulateB = info->b;
  1.1089 -    const Uint32 modulateA = info->a;
  1.1090      Uint32 pixel;
  1.1091 -    Uint32 R, G, B, A;
  1.1092 -    (void) A;  /* not all formats use alpha. */
  1.1093 -    (void) modulateA;  /* not all formats use alpha. */
  1.1094 +    Uint32 R, G, B;
  1.1095  
  1.1096      while (info->dst_h--) {
  1.1097          Uint32 *src = (Uint32 *)info->src;
  1.1098 @@ -4380,14 +4253,11 @@
  1.1099      const Uint32 modulateR = info->r;
  1.1100      const Uint32 modulateG = info->g;
  1.1101      const Uint32 modulateB = info->b;
  1.1102 -    const Uint32 modulateA = info->a;
  1.1103      Uint32 pixel;
  1.1104 -    Uint32 R, G, B, A;
  1.1105 +    Uint32 R, G, B;
  1.1106      int srcy, srcx;
  1.1107      int posy, posx;
  1.1108      int incy, incx;
  1.1109 -    (void) A;  /* not all formats use alpha. */
  1.1110 -    (void) modulateA;  /* not all formats use alpha. */
  1.1111  
  1.1112      srcy = 0;
  1.1113      posy = 0;
  1.1114 @@ -4439,9 +4309,7 @@
  1.1115      Uint32 srcpixel;
  1.1116      Uint32 srcR, srcG, srcB, srcA;
  1.1117      Uint32 dstpixel;
  1.1118 -    Uint32 dstR, dstG, dstB, dstA;
  1.1119 -    (void) modulateA;  /* not all formats use alpha. */
  1.1120 -    (void) dstA;  /* not all formats use alpha. */
  1.1121 +    Uint32 dstR, dstG, dstB;
  1.1122  
  1.1123      while (info->dst_h--) {
  1.1124          Uint32 *src = (Uint32 *)info->src;
  1.1125 @@ -4451,7 +4319,7 @@
  1.1126              srcpixel = *src;
  1.1127              srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1128              dstpixel = *dst;
  1.1129 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1130 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1131              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1132                  srcR = (srcR * modulateR) / 255;
  1.1133                  srcG = (srcG * modulateG) / 255;
  1.1134 @@ -4505,12 +4373,10 @@
  1.1135      Uint32 srcpixel;
  1.1136      Uint32 srcR, srcG, srcB, srcA;
  1.1137      Uint32 dstpixel;
  1.1138 -    Uint32 dstR, dstG, dstB, dstA;
  1.1139 +    Uint32 dstR, dstG, dstB;
  1.1140      int srcy, srcx;
  1.1141      int posy, posx;
  1.1142      int incy, incx;
  1.1143 -    (void) modulateA;  /* not all formats use alpha. */
  1.1144 -    (void) dstA;  /* not all formats use alpha. */
  1.1145  
  1.1146      srcy = 0;
  1.1147      posy = 0;
  1.1148 @@ -4538,7 +4404,7 @@
  1.1149              srcpixel = *src;
  1.1150              srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1151              dstpixel = *dst;
  1.1152 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1153 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1154              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1155                  srcR = (srcR * modulateR) / 255;
  1.1156                  srcG = (srcG * modulateG) / 255;
  1.1157 @@ -4589,7 +4455,6 @@
  1.1158      int srcy, srcx;
  1.1159      int posy, posx;
  1.1160      int incy, incx;
  1.1161 -    (void) A;  /* not all formats use alpha. */
  1.1162  
  1.1163      srcy = 0;
  1.1164      posy = 0;
  1.1165 @@ -4633,7 +4498,6 @@
  1.1166      Uint32 srcR, srcG, srcB, srcA;
  1.1167      Uint32 dstpixel;
  1.1168      Uint32 dstR, dstG, dstB, dstA;
  1.1169 -    (void) dstA;  /* not all formats use alpha. */
  1.1170  
  1.1171      while (info->dst_h--) {
  1.1172          Uint32 *src = (Uint32 *)info->src;
  1.1173 @@ -4690,7 +4554,6 @@
  1.1174      int srcy, srcx;
  1.1175      int posy, posx;
  1.1176      int incy, incx;
  1.1177 -    (void) dstA;  /* not all formats use alpha. */
  1.1178  
  1.1179      srcy = 0;
  1.1180      posy = 0;
  1.1181 @@ -4764,8 +4627,6 @@
  1.1182      const Uint32 modulateA = info->a;
  1.1183      Uint32 pixel;
  1.1184      Uint32 R, G, B, A;
  1.1185 -    (void) A;  /* not all formats use alpha. */
  1.1186 -    (void) modulateA;  /* not all formats use alpha. */
  1.1187  
  1.1188      while (info->dst_h--) {
  1.1189          Uint32 *src = (Uint32 *)info->src;
  1.1190 @@ -4804,8 +4665,6 @@
  1.1191      int srcy, srcx;
  1.1192      int posy, posx;
  1.1193      int incy, incx;
  1.1194 -    (void) A;  /* not all formats use alpha. */
  1.1195 -    (void) modulateA;  /* not all formats use alpha. */
  1.1196  
  1.1197      srcy = 0;
  1.1198      posy = 0;
  1.1199 @@ -4861,8 +4720,6 @@
  1.1200      Uint32 srcR, srcG, srcB, srcA;
  1.1201      Uint32 dstpixel;
  1.1202      Uint32 dstR, dstG, dstB, dstA;
  1.1203 -    (void) modulateA;  /* not all formats use alpha. */
  1.1204 -    (void) dstA;  /* not all formats use alpha. */
  1.1205  
  1.1206      while (info->dst_h--) {
  1.1207          Uint32 *src = (Uint32 *)info->src;
  1.1208 @@ -4931,8 +4788,6 @@
  1.1209      int srcy, srcx;
  1.1210      int posy, posx;
  1.1211      int incy, incx;
  1.1212 -    (void) modulateA;  /* not all formats use alpha. */
  1.1213 -    (void) dstA;  /* not all formats use alpha. */
  1.1214  
  1.1215      srcy = 0;
  1.1216      posy = 0;
  1.1217 @@ -5008,11 +4863,10 @@
  1.1218  static void SDL_Blit_ABGR8888_RGB888_Scale(SDL_BlitInfo *info)
  1.1219  {
  1.1220      Uint32 pixel;
  1.1221 -    Uint32 R, G, B, A;
  1.1222 +    Uint32 R, G, B;
  1.1223      int srcy, srcx;
  1.1224      int posy, posx;
  1.1225      int incy, incx;
  1.1226 -    (void) A;  /* not all formats use alpha. */
  1.1227  
  1.1228      srcy = 0;
  1.1229      posy = 0;
  1.1230 @@ -5055,8 +4909,7 @@
  1.1231      Uint32 srcpixel;
  1.1232      Uint32 srcR, srcG, srcB, srcA;
  1.1233      Uint32 dstpixel;
  1.1234 -    Uint32 dstR, dstG, dstB, dstA;
  1.1235 -    (void) dstA;  /* not all formats use alpha. */
  1.1236 +    Uint32 dstR, dstG, dstB;
  1.1237  
  1.1238      while (info->dst_h--) {
  1.1239          Uint32 *src = (Uint32 *)info->src;
  1.1240 @@ -5066,7 +4919,7 @@
  1.1241              srcpixel = *src;
  1.1242              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
  1.1243              dstpixel = *dst;
  1.1244 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
  1.1245 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
  1.1246              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
  1.1247                  /* This goes away if we ever use premultiplied alpha */
  1.1248                  if (srcA < 255) {
  1.1249 @@ -5108,11 +4961,10 @@
  1.1250      Uint32 srcpixel;
  1.1251      Uint32 srcR, srcG, srcB, srcA;
  1.1252      Uint32 dstpixel;
  1.1253 -    Uint32 dstR, dstG, dstB, dstA;
  1.1254 +    Uint32 dstR, dstG, dstB;
  1.1255      int srcy, srcx;
  1.1256      int posy, posx;
  1.1257      int incy, incx;
  1.1258 -    (void) dstA;  /* not all formats use alpha. */
  1.1259  
  1.1260      srcy = 0;
  1.1261      posy = 0;
  1.1262 @@ -5140,7 +4992,7 @@
  1.1263              srcpixel = *src;
  1.1264              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
  1.1265              dstpixel = *dst;
  1.1266 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
  1.1267 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
  1.1268              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
  1.1269                  /* This goes away if we ever use premultiplied alpha */
  1.1270                  if (srcA < 255) {
  1.1271 @@ -5182,11 +5034,8 @@
  1.1272      const Uint32 modulateR = info->r;
  1.1273      const Uint32 modulateG = info->g;
  1.1274      const Uint32 modulateB = info->b;
  1.1275 -    const Uint32 modulateA = info->a;
  1.1276      Uint32 pixel;
  1.1277 -    Uint32 R, G, B, A;
  1.1278 -    (void) A;  /* not all formats use alpha. */
  1.1279 -    (void) modulateA;  /* not all formats use alpha. */
  1.1280 +    Uint32 R, G, B;
  1.1281  
  1.1282      while (info->dst_h--) {
  1.1283          Uint32 *src = (Uint32 *)info->src;
  1.1284 @@ -5216,14 +5065,11 @@
  1.1285      const Uint32 modulateR = info->r;
  1.1286      const Uint32 modulateG = info->g;
  1.1287      const Uint32 modulateB = info->b;
  1.1288 -    const Uint32 modulateA = info->a;
  1.1289      Uint32 pixel;
  1.1290 -    Uint32 R, G, B, A;
  1.1291 +    Uint32 R, G, B;
  1.1292      int srcy, srcx;
  1.1293      int posy, posx;
  1.1294      int incy, incx;
  1.1295 -    (void) A;  /* not all formats use alpha. */
  1.1296 -    (void) modulateA;  /* not all formats use alpha. */
  1.1297  
  1.1298      srcy = 0;
  1.1299      posy = 0;
  1.1300 @@ -5275,9 +5121,7 @@
  1.1301      Uint32 srcpixel;
  1.1302      Uint32 srcR, srcG, srcB, srcA;
  1.1303      Uint32 dstpixel;
  1.1304 -    Uint32 dstR, dstG, dstB, dstA;
  1.1305 -    (void) modulateA;  /* not all formats use alpha. */
  1.1306 -    (void) dstA;  /* not all formats use alpha. */
  1.1307 +    Uint32 dstR, dstG, dstB;
  1.1308  
  1.1309      while (info->dst_h--) {
  1.1310          Uint32 *src = (Uint32 *)info->src;
  1.1311 @@ -5287,7 +5131,7 @@
  1.1312              srcpixel = *src;
  1.1313              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
  1.1314              dstpixel = *dst;
  1.1315 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
  1.1316 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
  1.1317              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1318                  srcR = (srcR * modulateR) / 255;
  1.1319                  srcG = (srcG * modulateG) / 255;
  1.1320 @@ -5341,12 +5185,10 @@
  1.1321      Uint32 srcpixel;
  1.1322      Uint32 srcR, srcG, srcB, srcA;
  1.1323      Uint32 dstpixel;
  1.1324 -    Uint32 dstR, dstG, dstB, dstA;
  1.1325 +    Uint32 dstR, dstG, dstB;
  1.1326      int srcy, srcx;
  1.1327      int posy, posx;
  1.1328      int incy, incx;
  1.1329 -    (void) modulateA;  /* not all formats use alpha. */
  1.1330 -    (void) dstA;  /* not all formats use alpha. */
  1.1331  
  1.1332      srcy = 0;
  1.1333      posy = 0;
  1.1334 @@ -5374,7 +5216,7 @@
  1.1335              srcpixel = *src;
  1.1336              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
  1.1337              dstpixel = *dst;
  1.1338 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
  1.1339 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
  1.1340              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1341                  srcR = (srcR * modulateR) / 255;
  1.1342                  srcG = (srcG * modulateG) / 255;
  1.1343 @@ -5421,11 +5263,10 @@
  1.1344  static void SDL_Blit_ABGR8888_BGR888_Scale(SDL_BlitInfo *info)
  1.1345  {
  1.1346      Uint32 pixel;
  1.1347 -    Uint32 R, G, B, A;
  1.1348 +    Uint32 R, G, B;
  1.1349      int srcy, srcx;
  1.1350      int posy, posx;
  1.1351      int incy, incx;
  1.1352 -    (void) A;  /* not all formats use alpha. */
  1.1353  
  1.1354      srcy = 0;
  1.1355      posy = 0;
  1.1356 @@ -5468,8 +5309,7 @@
  1.1357      Uint32 srcpixel;
  1.1358      Uint32 srcR, srcG, srcB, srcA;
  1.1359      Uint32 dstpixel;
  1.1360 -    Uint32 dstR, dstG, dstB, dstA;
  1.1361 -    (void) dstA;  /* not all formats use alpha. */
  1.1362 +    Uint32 dstR, dstG, dstB;
  1.1363  
  1.1364      while (info->dst_h--) {
  1.1365          Uint32 *src = (Uint32 *)info->src;
  1.1366 @@ -5479,7 +5319,7 @@
  1.1367              srcpixel = *src;
  1.1368              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
  1.1369              dstpixel = *dst;
  1.1370 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1371 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1372              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
  1.1373                  /* This goes away if we ever use premultiplied alpha */
  1.1374                  if (srcA < 255) {
  1.1375 @@ -5521,11 +5361,10 @@
  1.1376      Uint32 srcpixel;
  1.1377      Uint32 srcR, srcG, srcB, srcA;
  1.1378      Uint32 dstpixel;
  1.1379 -    Uint32 dstR, dstG, dstB, dstA;
  1.1380 +    Uint32 dstR, dstG, dstB;
  1.1381      int srcy, srcx;
  1.1382      int posy, posx;
  1.1383      int incy, incx;
  1.1384 -    (void) dstA;  /* not all formats use alpha. */
  1.1385  
  1.1386      srcy = 0;
  1.1387      posy = 0;
  1.1388 @@ -5553,7 +5392,7 @@
  1.1389              srcpixel = *src;
  1.1390              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
  1.1391              dstpixel = *dst;
  1.1392 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1393 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1394              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
  1.1395                  /* This goes away if we ever use premultiplied alpha */
  1.1396                  if (srcA < 255) {
  1.1397 @@ -5595,11 +5434,8 @@
  1.1398      const Uint32 modulateR = info->r;
  1.1399      const Uint32 modulateG = info->g;
  1.1400      const Uint32 modulateB = info->b;
  1.1401 -    const Uint32 modulateA = info->a;
  1.1402      Uint32 pixel;
  1.1403 -    Uint32 R, G, B, A;
  1.1404 -    (void) A;  /* not all formats use alpha. */
  1.1405 -    (void) modulateA;  /* not all formats use alpha. */
  1.1406 +    Uint32 R, G, B;
  1.1407  
  1.1408      while (info->dst_h--) {
  1.1409          Uint32 *src = (Uint32 *)info->src;
  1.1410 @@ -5629,14 +5465,11 @@
  1.1411      const Uint32 modulateR = info->r;
  1.1412      const Uint32 modulateG = info->g;
  1.1413      const Uint32 modulateB = info->b;
  1.1414 -    const Uint32 modulateA = info->a;
  1.1415      Uint32 pixel;
  1.1416 -    Uint32 R, G, B, A;
  1.1417 +    Uint32 R, G, B;
  1.1418      int srcy, srcx;
  1.1419      int posy, posx;
  1.1420      int incy, incx;
  1.1421 -    (void) A;  /* not all formats use alpha. */
  1.1422 -    (void) modulateA;  /* not all formats use alpha. */
  1.1423  
  1.1424      srcy = 0;
  1.1425      posy = 0;
  1.1426 @@ -5688,9 +5521,7 @@
  1.1427      Uint32 srcpixel;
  1.1428      Uint32 srcR, srcG, srcB, srcA;
  1.1429      Uint32 dstpixel;
  1.1430 -    Uint32 dstR, dstG, dstB, dstA;
  1.1431 -    (void) modulateA;  /* not all formats use alpha. */
  1.1432 -    (void) dstA;  /* not all formats use alpha. */
  1.1433 +    Uint32 dstR, dstG, dstB;
  1.1434  
  1.1435      while (info->dst_h--) {
  1.1436          Uint32 *src = (Uint32 *)info->src;
  1.1437 @@ -5700,7 +5531,7 @@
  1.1438              srcpixel = *src;
  1.1439              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
  1.1440              dstpixel = *dst;
  1.1441 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1442 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1443              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1444                  srcR = (srcR * modulateR) / 255;
  1.1445                  srcG = (srcG * modulateG) / 255;
  1.1446 @@ -5754,12 +5585,10 @@
  1.1447      Uint32 srcpixel;
  1.1448      Uint32 srcR, srcG, srcB, srcA;
  1.1449      Uint32 dstpixel;
  1.1450 -    Uint32 dstR, dstG, dstB, dstA;
  1.1451 +    Uint32 dstR, dstG, dstB;
  1.1452      int srcy, srcx;
  1.1453      int posy, posx;
  1.1454      int incy, incx;
  1.1455 -    (void) modulateA;  /* not all formats use alpha. */
  1.1456 -    (void) dstA;  /* not all formats use alpha. */
  1.1457  
  1.1458      srcy = 0;
  1.1459      posy = 0;
  1.1460 @@ -5787,7 +5616,7 @@
  1.1461              srcpixel = *src;
  1.1462              srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = (Uint8)(srcpixel >> 24);
  1.1463              dstpixel = *dst;
  1.1464 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1465 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1466              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1467                  srcR = (srcR * modulateR) / 255;
  1.1468                  srcG = (srcG * modulateG) / 255;
  1.1469 @@ -5838,7 +5667,6 @@
  1.1470      int srcy, srcx;
  1.1471      int posy, posx;
  1.1472      int incy, incx;
  1.1473 -    (void) A;  /* not all formats use alpha. */
  1.1474  
  1.1475      srcy = 0;
  1.1476      posy = 0;
  1.1477 @@ -5882,7 +5710,6 @@
  1.1478      Uint32 srcR, srcG, srcB, srcA;
  1.1479      Uint32 dstpixel;
  1.1480      Uint32 dstR, dstG, dstB, dstA;
  1.1481 -    (void) dstA;  /* not all formats use alpha. */
  1.1482  
  1.1483      while (info->dst_h--) {
  1.1484          Uint32 *src = (Uint32 *)info->src;
  1.1485 @@ -5939,7 +5766,6 @@
  1.1486      int srcy, srcx;
  1.1487      int posy, posx;
  1.1488      int incy, incx;
  1.1489 -    (void) dstA;  /* not all formats use alpha. */
  1.1490  
  1.1491      srcy = 0;
  1.1492      posy = 0;
  1.1493 @@ -6013,8 +5839,6 @@
  1.1494      const Uint32 modulateA = info->a;
  1.1495      Uint32 pixel;
  1.1496      Uint32 R, G, B, A;
  1.1497 -    (void) A;  /* not all formats use alpha. */
  1.1498 -    (void) modulateA;  /* not all formats use alpha. */
  1.1499  
  1.1500      while (info->dst_h--) {
  1.1501          Uint32 *src = (Uint32 *)info->src;
  1.1502 @@ -6053,8 +5877,6 @@
  1.1503      int srcy, srcx;
  1.1504      int posy, posx;
  1.1505      int incy, incx;
  1.1506 -    (void) A;  /* not all formats use alpha. */
  1.1507 -    (void) modulateA;  /* not all formats use alpha. */
  1.1508  
  1.1509      srcy = 0;
  1.1510      posy = 0;
  1.1511 @@ -6110,8 +5932,6 @@
  1.1512      Uint32 srcR, srcG, srcB, srcA;
  1.1513      Uint32 dstpixel;
  1.1514      Uint32 dstR, dstG, dstB, dstA;
  1.1515 -    (void) modulateA;  /* not all formats use alpha. */
  1.1516 -    (void) dstA;  /* not all formats use alpha. */
  1.1517  
  1.1518      while (info->dst_h--) {
  1.1519          Uint32 *src = (Uint32 *)info->src;
  1.1520 @@ -6180,8 +6000,6 @@
  1.1521      int srcy, srcx;
  1.1522      int posy, posx;
  1.1523      int incy, incx;
  1.1524 -    (void) modulateA;  /* not all formats use alpha. */
  1.1525 -    (void) dstA;  /* not all formats use alpha. */
  1.1526  
  1.1527      srcy = 0;
  1.1528      posy = 0;
  1.1529 @@ -6257,11 +6075,10 @@
  1.1530  static void SDL_Blit_BGRA8888_RGB888_Scale(SDL_BlitInfo *info)
  1.1531  {
  1.1532      Uint32 pixel;
  1.1533 -    Uint32 R, G, B, A;
  1.1534 +    Uint32 R, G, B;
  1.1535      int srcy, srcx;
  1.1536      int posy, posx;
  1.1537      int incy, incx;
  1.1538 -    (void) A;  /* not all formats use alpha. */
  1.1539  
  1.1540      srcy = 0;
  1.1541      posy = 0;
  1.1542 @@ -6304,8 +6121,7 @@
  1.1543      Uint32 srcpixel;
  1.1544      Uint32 srcR, srcG, srcB, srcA;
  1.1545      Uint32 dstpixel;
  1.1546 -    Uint32 dstR, dstG, dstB, dstA;
  1.1547 -    (void) dstA;  /* not all formats use alpha. */
  1.1548 +    Uint32 dstR, dstG, dstB;
  1.1549  
  1.1550      while (info->dst_h--) {
  1.1551          Uint32 *src = (Uint32 *)info->src;
  1.1552 @@ -6315,7 +6131,7 @@
  1.1553              srcpixel = *src;
  1.1554              srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1555              dstpixel = *dst;
  1.1556 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
  1.1557 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
  1.1558              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
  1.1559                  /* This goes away if we ever use premultiplied alpha */
  1.1560                  if (srcA < 255) {
  1.1561 @@ -6357,11 +6173,10 @@
  1.1562      Uint32 srcpixel;
  1.1563      Uint32 srcR, srcG, srcB, srcA;
  1.1564      Uint32 dstpixel;
  1.1565 -    Uint32 dstR, dstG, dstB, dstA;
  1.1566 +    Uint32 dstR, dstG, dstB;
  1.1567      int srcy, srcx;
  1.1568      int posy, posx;
  1.1569      int incy, incx;
  1.1570 -    (void) dstA;  /* not all formats use alpha. */
  1.1571  
  1.1572      srcy = 0;
  1.1573      posy = 0;
  1.1574 @@ -6389,7 +6204,7 @@
  1.1575              srcpixel = *src;
  1.1576              srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1577              dstpixel = *dst;
  1.1578 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
  1.1579 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
  1.1580              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
  1.1581                  /* This goes away if we ever use premultiplied alpha */
  1.1582                  if (srcA < 255) {
  1.1583 @@ -6431,11 +6246,8 @@
  1.1584      const Uint32 modulateR = info->r;
  1.1585      const Uint32 modulateG = info->g;
  1.1586      const Uint32 modulateB = info->b;
  1.1587 -    const Uint32 modulateA = info->a;
  1.1588      Uint32 pixel;
  1.1589 -    Uint32 R, G, B, A;
  1.1590 -    (void) A;  /* not all formats use alpha. */
  1.1591 -    (void) modulateA;  /* not all formats use alpha. */
  1.1592 +    Uint32 R, G, B;
  1.1593  
  1.1594      while (info->dst_h--) {
  1.1595          Uint32 *src = (Uint32 *)info->src;
  1.1596 @@ -6465,14 +6277,11 @@
  1.1597      const Uint32 modulateR = info->r;
  1.1598      const Uint32 modulateG = info->g;
  1.1599      const Uint32 modulateB = info->b;
  1.1600 -    const Uint32 modulateA = info->a;
  1.1601      Uint32 pixel;
  1.1602 -    Uint32 R, G, B, A;
  1.1603 +    Uint32 R, G, B;
  1.1604      int srcy, srcx;
  1.1605      int posy, posx;
  1.1606      int incy, incx;
  1.1607 -    (void) A;  /* not all formats use alpha. */
  1.1608 -    (void) modulateA;  /* not all formats use alpha. */
  1.1609  
  1.1610      srcy = 0;
  1.1611      posy = 0;
  1.1612 @@ -6524,9 +6333,7 @@
  1.1613      Uint32 srcpixel;
  1.1614      Uint32 srcR, srcG, srcB, srcA;
  1.1615      Uint32 dstpixel;
  1.1616 -    Uint32 dstR, dstG, dstB, dstA;
  1.1617 -    (void) modulateA;  /* not all formats use alpha. */
  1.1618 -    (void) dstA;  /* not all formats use alpha. */
  1.1619 +    Uint32 dstR, dstG, dstB;
  1.1620  
  1.1621      while (info->dst_h--) {
  1.1622          Uint32 *src = (Uint32 *)info->src;
  1.1623 @@ -6536,7 +6343,7 @@
  1.1624              srcpixel = *src;
  1.1625              srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1626              dstpixel = *dst;
  1.1627 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
  1.1628 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
  1.1629              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1630                  srcR = (srcR * modulateR) / 255;
  1.1631                  srcG = (srcG * modulateG) / 255;
  1.1632 @@ -6590,12 +6397,10 @@
  1.1633      Uint32 srcpixel;
  1.1634      Uint32 srcR, srcG, srcB, srcA;
  1.1635      Uint32 dstpixel;
  1.1636 -    Uint32 dstR, dstG, dstB, dstA;
  1.1637 +    Uint32 dstR, dstG, dstB;
  1.1638      int srcy, srcx;
  1.1639      int posy, posx;
  1.1640      int incy, incx;
  1.1641 -    (void) modulateA;  /* not all formats use alpha. */
  1.1642 -    (void) dstA;  /* not all formats use alpha. */
  1.1643  
  1.1644      srcy = 0;
  1.1645      posy = 0;
  1.1646 @@ -6623,7 +6428,7 @@
  1.1647              srcpixel = *src;
  1.1648              srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1649              dstpixel = *dst;
  1.1650 -            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
  1.1651 +            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
  1.1652              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1653                  srcR = (srcR * modulateR) / 255;
  1.1654                  srcG = (srcG * modulateG) / 255;
  1.1655 @@ -6670,11 +6475,10 @@
  1.1656  static void SDL_Blit_BGRA8888_BGR888_Scale(SDL_BlitInfo *info)
  1.1657  {
  1.1658      Uint32 pixel;
  1.1659 -    Uint32 R, G, B, A;
  1.1660 +    Uint32 R, G, B;
  1.1661      int srcy, srcx;
  1.1662      int posy, posx;
  1.1663      int incy, incx;
  1.1664 -    (void) A;  /* not all formats use alpha. */
  1.1665  
  1.1666      srcy = 0;
  1.1667      posy = 0;
  1.1668 @@ -6717,8 +6521,7 @@
  1.1669      Uint32 srcpixel;
  1.1670      Uint32 srcR, srcG, srcB, srcA;
  1.1671      Uint32 dstpixel;
  1.1672 -    Uint32 dstR, dstG, dstB, dstA;
  1.1673 -    (void) dstA;  /* not all formats use alpha. */
  1.1674 +    Uint32 dstR, dstG, dstB;
  1.1675  
  1.1676      while (info->dst_h--) {
  1.1677          Uint32 *src = (Uint32 *)info->src;
  1.1678 @@ -6728,7 +6531,7 @@
  1.1679              srcpixel = *src;
  1.1680              srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1681              dstpixel = *dst;
  1.1682 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1683 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1684              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
  1.1685                  /* This goes away if we ever use premultiplied alpha */
  1.1686                  if (srcA < 255) {
  1.1687 @@ -6770,11 +6573,10 @@
  1.1688      Uint32 srcpixel;
  1.1689      Uint32 srcR, srcG, srcB, srcA;
  1.1690      Uint32 dstpixel;
  1.1691 -    Uint32 dstR, dstG, dstB, dstA;
  1.1692 +    Uint32 dstR, dstG, dstB;
  1.1693      int srcy, srcx;
  1.1694      int posy, posx;
  1.1695      int incy, incx;
  1.1696 -    (void) dstA;  /* not all formats use alpha. */
  1.1697  
  1.1698      srcy = 0;
  1.1699      posy = 0;
  1.1700 @@ -6802,7 +6604,7 @@
  1.1701              srcpixel = *src;
  1.1702              srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1703              dstpixel = *dst;
  1.1704 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1705 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1706              if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
  1.1707                  /* This goes away if we ever use premultiplied alpha */
  1.1708                  if (srcA < 255) {
  1.1709 @@ -6844,11 +6646,8 @@
  1.1710      const Uint32 modulateR = info->r;
  1.1711      const Uint32 modulateG = info->g;
  1.1712      const Uint32 modulateB = info->b;
  1.1713 -    const Uint32 modulateA = info->a;
  1.1714      Uint32 pixel;
  1.1715 -    Uint32 R, G, B, A;
  1.1716 -    (void) A;  /* not all formats use alpha. */
  1.1717 -    (void) modulateA;  /* not all formats use alpha. */
  1.1718 +    Uint32 R, G, B;
  1.1719  
  1.1720      while (info->dst_h--) {
  1.1721          Uint32 *src = (Uint32 *)info->src;
  1.1722 @@ -6878,14 +6677,11 @@
  1.1723      const Uint32 modulateR = info->r;
  1.1724      const Uint32 modulateG = info->g;
  1.1725      const Uint32 modulateB = info->b;
  1.1726 -    const Uint32 modulateA = info->a;
  1.1727      Uint32 pixel;
  1.1728 -    Uint32 R, G, B, A;
  1.1729 +    Uint32 R, G, B;
  1.1730      int srcy, srcx;
  1.1731      int posy, posx;
  1.1732      int incy, incx;
  1.1733 -    (void) A;  /* not all formats use alpha. */
  1.1734 -    (void) modulateA;  /* not all formats use alpha. */
  1.1735  
  1.1736      srcy = 0;
  1.1737      posy = 0;
  1.1738 @@ -6937,9 +6733,7 @@
  1.1739      Uint32 srcpixel;
  1.1740      Uint32 srcR, srcG, srcB, srcA;
  1.1741      Uint32 dstpixel;
  1.1742 -    Uint32 dstR, dstG, dstB, dstA;
  1.1743 -    (void) modulateA;  /* not all formats use alpha. */
  1.1744 -    (void) dstA;  /* not all formats use alpha. */
  1.1745 +    Uint32 dstR, dstG, dstB;
  1.1746  
  1.1747      while (info->dst_h--) {
  1.1748          Uint32 *src = (Uint32 *)info->src;
  1.1749 @@ -6949,7 +6743,7 @@
  1.1750              srcpixel = *src;
  1.1751              srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1752              dstpixel = *dst;
  1.1753 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1754 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1755              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1756                  srcR = (srcR * modulateR) / 255;
  1.1757                  srcG = (srcG * modulateG) / 255;
  1.1758 @@ -7003,12 +6797,10 @@
  1.1759      Uint32 srcpixel;
  1.1760      Uint32 srcR, srcG, srcB, srcA;
  1.1761      Uint32 dstpixel;
  1.1762 -    Uint32 dstR, dstG, dstB, dstA;
  1.1763 +    Uint32 dstR, dstG, dstB;
  1.1764      int srcy, srcx;
  1.1765      int posy, posx;
  1.1766      int incy, incx;
  1.1767 -    (void) modulateA;  /* not all formats use alpha. */
  1.1768 -    (void) dstA;  /* not all formats use alpha. */
  1.1769  
  1.1770      srcy = 0;
  1.1771      posy = 0;
  1.1772 @@ -7036,7 +6828,7 @@
  1.1773              srcpixel = *src;
  1.1774              srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
  1.1775              dstpixel = *dst;
  1.1776 -            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
  1.1777 +            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel;
  1.1778              if (flags & SDL_COPY_MODULATE_COLOR) {
  1.1779                  srcR = (srcR * modulateR) / 255;
  1.1780                  srcG = (srcG * modulateG) / 255;
  1.1781 @@ -7087,7 +6879,6 @@
  1.1782      int srcy, srcx;
  1.1783      int posy, posx;
  1.1784      int incy, incx;
  1.1785 -    (void) A;  /* not all formats use alpha. */
  1.1786  
  1.1787      srcy = 0;
  1.1788      posy = 0;
  1.1789 @@ -7131,7 +6922,6 @@
  1.1790      Uint32 srcR, srcG, srcB, srcA;
  1.1791      Uint32 dstpixel;
  1.1792      Uint32 dstR, dstG, dstB, dstA;
  1.1793 -    (void) dstA;  /* not all formats use alpha. */
  1.1794  
  1.1795      while (info->dst_h--) {
  1.1796          Uint32 *src = (Uint32 *)info->src;
  1.1797 @@ -7188,7 +6978,6 @@
  1.1798      int srcy, srcx;
  1.1799      int posy, posx;
  1.1800      int incy, incx;
  1.1801 -    (void) dstA;  /* not all formats use alpha. */
  1.1802  
  1.1803      srcy = 0;
  1.1804      posy = 0;
  1.1805 @@ -7262,8 +7051,6 @@
  1.1806      const Uint32 modulateA = info->a;
  1.1807      Uint32 pixel;
  1.1808      Uint32 R, G, B, A;
  1.1809 -    (void) A;  /* not all formats use alpha. */
  1.1810 -    (void) modulateA;  /* not all formats use alpha. */
  1.1811  
  1.1812      while (info->dst_h--) {
  1.1813          Uint32 *src = (Uint32 *)info->src;
  1.1814 @@ -7302,8 +7089,6 @@
  1.1815      int srcy, srcx;
  1.1816      int posy, posx;
  1.1817      int incy, incx;
  1.1818 -    (void) A;  /* not all formats use alpha. */
  1.1819 -    (void) modulateA;  /* not all formats use alpha. */
  1.1820  
  1.1821      srcy = 0;
  1.1822      posy = 0;
  1.1823 @@ -7359,8 +7144,6 @@
  1.1824      Uint32 srcR, srcG, srcB, srcA;
  1.1825      Uint32 dstpixel;
  1.1826      Uint32 dstR, dstG, dstB, dstA;
  1.1827 -    (void) modulateA;  /* not all formats use alpha. */
  1.1828 -    (void) dstA;  /* not all formats use alpha. */
  1.1829  
  1.1830      while (info->dst_h--) {
  1.1831          Uint32 *src = (Uint32 *)info->src;
  1.1832 @@ -7429,8 +7212,6 @@
  1.1833      int srcy, srcx;
  1.1834      int posy, posx;
  1.1835      int incy, incx;
  1.1836 -    (void) modulateA;  /* not all formats use alpha. */
  1.1837 -    (void) dstA;  /* not all formats use alpha. */
  1.1838  
  1.1839      srcy = 0;
  1.1840      posy = 0;