SDL_bmp.c: remove unused variable warnings
authorSylvain Becker <sylvain.becker@gmail.com>
Thu, 05 Sep 2019 10:08:47 +0200
changeset 1305897448bd2f819
parent 13057 86d690b71e35
child 13059 e95211b1bd26
SDL_bmp.c: remove unused variable warnings
src/video/SDL_bmp.c
     1.1 --- a/src/video/SDL_bmp.c	Wed Sep 04 09:27:58 2019 -0700
     1.2 +++ b/src/video/SDL_bmp.c	Thu Sep 05 10:08:47 2019 +0200
     1.3 @@ -192,23 +192,23 @@
     1.4  
     1.5      /* The Win32 BMP file header (14 bytes) */
     1.6      char magic[2];
     1.7 -    Uint32 bfSize;
     1.8 -    Uint16 bfReserved1;
     1.9 -    Uint16 bfReserved2;
    1.10 +    /* Uint32 bfSize; */
    1.11 +    /* Uint16 bfReserved1; */
    1.12 +    /* Uint16 bfReserved2; */
    1.13      Uint32 bfOffBits;
    1.14  
    1.15      /* The Win32 BITMAPINFOHEADER struct (40 bytes) */
    1.16      Uint32 biSize;
    1.17      Sint32 biWidth = 0;
    1.18      Sint32 biHeight = 0;
    1.19 -    Uint16 biPlanes;
    1.20 +    /* Uint16 biPlanes; */
    1.21      Uint16 biBitCount = 0;
    1.22      Uint32 biCompression = 0;
    1.23 -    Uint32 biSizeImage;
    1.24 -    Sint32 biXPelsPerMeter;
    1.25 -    Sint32 biYPelsPerMeter;
    1.26 +    /* Uint32 biSizeImage; */
    1.27 +    /* Sint32 biXPelsPerMeter; */
    1.28 +    /* Sint32 biYPelsPerMeter; */
    1.29      Uint32 biClrUsed = 0;
    1.30 -    Uint32 biClrImportant;
    1.31 +    /* Uint32 biClrImportant; */
    1.32  
    1.33      /* Make sure we are passed a valid data source */
    1.34      surface = NULL;
    1.35 @@ -231,9 +231,9 @@
    1.36          was_error = SDL_TRUE;
    1.37          goto done;
    1.38      }
    1.39 -    bfSize      = SDL_ReadLE32(src);
    1.40 -    bfReserved1 = SDL_ReadLE16(src);
    1.41 -    bfReserved2 = SDL_ReadLE16(src);
    1.42 +    /* bfSize      = */ SDL_ReadLE32(src);
    1.43 +    /* bfReserved1 = */ SDL_ReadLE16(src);
    1.44 +    /* bfReserved2 = */ SDL_ReadLE16(src);
    1.45      bfOffBits   = SDL_ReadLE32(src);
    1.46  
    1.47      /* Read the Win32 BITMAPINFOHEADER */
    1.48 @@ -241,26 +241,26 @@
    1.49      if (biSize == 12) {   /* really old BITMAPCOREHEADER */
    1.50          biWidth = (Uint32) SDL_ReadLE16(src);
    1.51          biHeight = (Uint32) SDL_ReadLE16(src);
    1.52 -        biPlanes = SDL_ReadLE16(src);
    1.53 +        /* biPlanes = */ SDL_ReadLE16(src);
    1.54          biBitCount = SDL_ReadLE16(src);
    1.55          biCompression = BI_RGB;
    1.56 -        biSizeImage = 0;
    1.57 -        biXPelsPerMeter = 0;
    1.58 -        biYPelsPerMeter = 0;
    1.59 +        /* biSizeImage = 0; */
    1.60 +        /* biXPelsPerMeter = 0; */
    1.61 +        /* biYPelsPerMeter = 0; */
    1.62          biClrUsed = 0;
    1.63 -        biClrImportant = 0;
    1.64 +        /* biClrImportant = 0; */
    1.65      } else if (biSize >= 40) {  /* some version of BITMAPINFOHEADER */
    1.66          Uint32 headerSize;
    1.67          biWidth = SDL_ReadLE32(src);
    1.68          biHeight = SDL_ReadLE32(src);
    1.69 -        biPlanes = SDL_ReadLE16(src);
    1.70 +        /* biPlanes = */ SDL_ReadLE16(src);
    1.71          biBitCount = SDL_ReadLE16(src);
    1.72          biCompression = SDL_ReadLE32(src);
    1.73 -        biSizeImage = SDL_ReadLE32(src);
    1.74 -        biXPelsPerMeter = SDL_ReadLE32(src);
    1.75 -        biYPelsPerMeter = SDL_ReadLE32(src);
    1.76 +        /* biSizeImage = */ SDL_ReadLE32(src);
    1.77 +        /* biXPelsPerMeter = */ SDL_ReadLE32(src);
    1.78 +        /* biYPelsPerMeter = */ SDL_ReadLE32(src);
    1.79          biClrUsed = SDL_ReadLE32(src);
    1.80 -        biClrImportant = SDL_ReadLE32(src);
    1.81 +        /* biClrImportant = */ SDL_ReadLE32(src);
    1.82  
    1.83          /* 64 == BITMAPCOREHEADER2, an incompatible OS/2 2.x extension. Skip this stuff for now. */
    1.84          if (biSize != 64) {