Commit 1b5e3c19a293872fb04b4fa227d8dcdc8f2e827c
2019-09-05T10:08:47
SDL_bmp.c: remove unused variable warnings
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c
index 3ee4056..1c0c8b2 100644
--- a/src/video/SDL_bmp.c
+++ b/src/video/SDL_bmp.c
@@ -192,23 +192,23 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
/* The Win32 BMP file header (14 bytes) */
char magic[2];
- Uint32 bfSize;
- Uint16 bfReserved1;
- Uint16 bfReserved2;
+ /* Uint32 bfSize; */
+ /* Uint16 bfReserved1; */
+ /* Uint16 bfReserved2; */
Uint32 bfOffBits;
/* The Win32 BITMAPINFOHEADER struct (40 bytes) */
Uint32 biSize;
Sint32 biWidth = 0;
Sint32 biHeight = 0;
- Uint16 biPlanes;
+ /* Uint16 biPlanes; */
Uint16 biBitCount = 0;
Uint32 biCompression = 0;
- Uint32 biSizeImage;
- Sint32 biXPelsPerMeter;
- Sint32 biYPelsPerMeter;
+ /* Uint32 biSizeImage; */
+ /* Sint32 biXPelsPerMeter; */
+ /* Sint32 biYPelsPerMeter; */
Uint32 biClrUsed = 0;
- Uint32 biClrImportant;
+ /* Uint32 biClrImportant; */
/* Make sure we are passed a valid data source */
surface = NULL;
@@ -231,9 +231,9 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
was_error = SDL_TRUE;
goto done;
}
- bfSize = SDL_ReadLE32(src);
- bfReserved1 = SDL_ReadLE16(src);
- bfReserved2 = SDL_ReadLE16(src);
+ /* bfSize = */ SDL_ReadLE32(src);
+ /* bfReserved1 = */ SDL_ReadLE16(src);
+ /* bfReserved2 = */ SDL_ReadLE16(src);
bfOffBits = SDL_ReadLE32(src);
/* Read the Win32 BITMAPINFOHEADER */
@@ -241,26 +241,26 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
if (biSize == 12) { /* really old BITMAPCOREHEADER */
biWidth = (Uint32) SDL_ReadLE16(src);
biHeight = (Uint32) SDL_ReadLE16(src);
- biPlanes = SDL_ReadLE16(src);
+ /* biPlanes = */ SDL_ReadLE16(src);
biBitCount = SDL_ReadLE16(src);
biCompression = BI_RGB;
- biSizeImage = 0;
- biXPelsPerMeter = 0;
- biYPelsPerMeter = 0;
+ /* biSizeImage = 0; */
+ /* biXPelsPerMeter = 0; */
+ /* biYPelsPerMeter = 0; */
biClrUsed = 0;
- biClrImportant = 0;
+ /* biClrImportant = 0; */
} else if (biSize >= 40) { /* some version of BITMAPINFOHEADER */
Uint32 headerSize;
biWidth = SDL_ReadLE32(src);
biHeight = SDL_ReadLE32(src);
- biPlanes = SDL_ReadLE16(src);
+ /* biPlanes = */ SDL_ReadLE16(src);
biBitCount = SDL_ReadLE16(src);
biCompression = SDL_ReadLE32(src);
- biSizeImage = SDL_ReadLE32(src);
- biXPelsPerMeter = SDL_ReadLE32(src);
- biYPelsPerMeter = SDL_ReadLE32(src);
+ /* biSizeImage = */ SDL_ReadLE32(src);
+ /* biXPelsPerMeter = */ SDL_ReadLE32(src);
+ /* biYPelsPerMeter = */ SDL_ReadLE32(src);
biClrUsed = SDL_ReadLE32(src);
- biClrImportant = SDL_ReadLE32(src);
+ /* biClrImportant = */ SDL_ReadLE32(src);
/* 64 == BITMAPCOREHEADER2, an incompatible OS/2 2.x extension. Skip this stuff for now. */
if (biSize != 64) {