Merge commit 'c93e3b36074ddb2ed986cbacc5e9d4f3a60db343' into main

This commit is contained in:
Sam Lantinga 2021-05-07 12:28:27 -07:00
commit 572dfb4f6e

View file

@ -1423,9 +1423,12 @@ SDL_RLESurface(SDL_Surface * surface)
return -1;
}
/* If we don't have colorkey or blending, nothing to do... */
flags = surface->map->info.flags;
if (!(flags & (SDL_COPY_COLORKEY | SDL_COPY_BLEND))) {
if (flags & SDL_COPY_COLORKEY) {
/* ok */
} else if ((flags & SDL_COPY_BLEND) && surface->format->Amask) {
/* ok */
} else {
/* If we don't have colorkey or blending, nothing to do... */
return -1;
}