From 03f8528315fa46c95991a34f3325d7b33ae5538c Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Sat, 02 May 2020 21:48:36 +0000
Subject: [PATCH] Update source to SDL2 2.0.12
---
source/src/video/SDL_pixels.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/source/src/video/SDL_pixels.c b/source/src/video/SDL_pixels.c
index c2e4163..f02a2bd 100644
--- a/source/src/video/SDL_pixels.c
+++ b/source/src/video/SDL_pixels.c
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
- Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -94,6 +94,7 @@
CASE(SDL_PIXELFORMAT_INDEX8)
CASE(SDL_PIXELFORMAT_RGB332)
CASE(SDL_PIXELFORMAT_RGB444)
+ CASE(SDL_PIXELFORMAT_BGR444)
CASE(SDL_PIXELFORMAT_RGB555)
CASE(SDL_PIXELFORMAT_BGR555)
CASE(SDL_PIXELFORMAT_ARGB4444)
@@ -320,6 +321,12 @@
Bmask == 0x000F &&
Amask == 0x0000) {
return SDL_PIXELFORMAT_RGB444;
+ }
+ if (Rmask == 0x000F &&
+ Gmask == 0x00F0 &&
+ Bmask == 0x0F00 &&
+ Amask == 0x0000) {
+ return SDL_PIXELFORMAT_BGR444;
}
break;
case 15:
@@ -996,9 +1003,11 @@
/* Clear out any previous mapping */
map = src->map;
+#if SDL_HAVE_RLE
if ((src->flags & SDL_RLEACCEL) == SDL_RLEACCEL) {
SDL_UnRLESurface(src, 1);
}
+#endif
SDL_InvalidateMap(map);
/* Figure out what kind of mapping we're doing */
--
Gitblit v1.9.3