mirrors/SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed setting invalid bpp for FOURCC formats in SDL_GetMasksForPixelFormatEnum()

Browse Source
This commit is contained in:
Sam Lantinga 2023-08-07 22:20:40 -07:00
parent 8fdebdd3e0
commit 79a190aa23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/SDL_pixels.c
View File

@ -140,6 +140,12 @@ SDL_bool SDL_GetMasksForPixelFormatEnum(Uint32 format, int *bpp, Uint32 *Rmask,
#if SDL_HAVE_YUV #if SDL_HAVE_YUV
/* Partial support for SDL_Surface with FOURCC */ /* Partial support for SDL_Surface with FOURCC */
if (SDL_ISPIXELFORMAT_FOURCC(format)) {
/* Not a format that uses masks */
*bpp = 0;
*Rmask = *Gmask = *Bmask = *Amask = 0;
return SDL_TRUE;
}
#else #else
if (SDL_ISPIXELFORMAT_FOURCC(format)) { if (SDL_ISPIXELFORMAT_FOURCC(format)) {
SDL_SetError("SDL not built with YUV support"); SDL_SetError("SDL not built with YUV support");
@ -181,11 +187,6 @@ SDL_bool SDL_GetMasksForPixelFormatEnum(Uint32 format, int *bpp, Uint32 *Rmask,
return SDL_TRUE; return SDL_TRUE;
} }
if (SDL_ISPIXELFORMAT_FOURCC(format)) {
/* Not a format that uses masks */
return SDL_TRUE;
}
if (SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED8 && if (SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED8 &&
SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED16 && SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED16 &&
SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED32) { SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED32) {