LoadBMP: fix some warnings

This commit is contained in:
Sylvain Becker 2019-08-31 22:58:11 +02:00
parent 830979c555
commit 6c295129ba

View File

@ -173,7 +173,7 @@ SDL_Surface *
SDL_LoadBMP_RW(SDL_RWops * src, int freesrc) SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
{ {
SDL_bool was_error; SDL_bool was_error;
Sint64 fp_offset; Sint64 fp_offset = 0;
int bmpPitch; int bmpPitch;
int i, pad; int i, pad;
SDL_Surface *surface; SDL_Surface *surface;
@ -199,15 +199,15 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
/* The Win32 BITMAPINFOHEADER struct (40 bytes) */ /* The Win32 BITMAPINFOHEADER struct (40 bytes) */
Uint32 biSize; Uint32 biSize;
Sint32 biWidth; Sint32 biWidth = 0;
Sint32 biHeight = 0; Sint32 biHeight = 0;
Uint16 biPlanes; Uint16 biPlanes;
Uint16 biBitCount; Uint16 biBitCount = 0;
Uint32 biCompression; Uint32 biCompression = 0;
Uint32 biSizeImage; Uint32 biSizeImage;
Sint32 biXPelsPerMeter; Sint32 biXPelsPerMeter;
Sint32 biYPelsPerMeter; Sint32 biYPelsPerMeter;
Uint32 biClrUsed; Uint32 biClrUsed = 0;
Uint32 biClrImportant; Uint32 biClrImportant;
/* Make sure we are passed a valid data source */ /* Make sure we are passed a valid data source */
@ -390,7 +390,7 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
} }
/* Create a compatible surface, note that the colors are RGB ordered */ /* Create a compatible surface, note that the colors are RGB ordered */
surface = SDL_CreateRGBSurface(SDL_SWSURFACE, surface = SDL_CreateRGBSurface(0,
biWidth, biHeight, biBitCount, Rmask, Gmask, Bmask, Amask); biWidth, biHeight, biBitCount, Rmask, Gmask, Bmask, Amask);
if ( surface == NULL ) { if ( surface == NULL ) {
was_error = SDL_TRUE; was_error = SDL_TRUE;