mirror of
https://github.com/Relintai/sdl2_frt.git
synced 2024-12-20 22:16:49 +01:00
SDL_ConvertColorkeyToAlpha: remove and clarify a FIXME
This function doesn't handle bpp 1 or 3 case, because those formats never have an alpha channel
This commit is contained in:
parent
85235985fb
commit
c0166a29b7
@ -326,11 +326,12 @@ SDL_GetColorKey(SDL_Surface * surface, Uint32 * key)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This is a fairly slow function to switch from colorkey to alpha */
|
/* This is a fairly slow function to switch from colorkey to alpha
|
||||||
|
NB: it doesn't handle bpp 1 or 3, because they have no alpha channel */
|
||||||
static void
|
static void
|
||||||
SDL_ConvertColorkeyToAlpha(SDL_Surface * surface, SDL_bool ignore_alpha)
|
SDL_ConvertColorkeyToAlpha(SDL_Surface * surface, SDL_bool ignore_alpha)
|
||||||
{
|
{
|
||||||
int x, y;
|
int x, y, bpp;
|
||||||
|
|
||||||
if (!surface) {
|
if (!surface) {
|
||||||
return;
|
return;
|
||||||
@ -341,11 +342,11 @@ SDL_ConvertColorkeyToAlpha(SDL_Surface * surface, SDL_bool ignore_alpha)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bpp = surface->format->BytesPerPixel;
|
||||||
|
|
||||||
SDL_LockSurface(surface);
|
SDL_LockSurface(surface);
|
||||||
|
|
||||||
switch (surface->format->BytesPerPixel) {
|
if (bpp == 2) {
|
||||||
case 2:
|
|
||||||
{
|
|
||||||
Uint16 *row, *spot;
|
Uint16 *row, *spot;
|
||||||
Uint16 ckey = (Uint16) surface->map->info.colorkey;
|
Uint16 ckey = (Uint16) surface->map->info.colorkey;
|
||||||
Uint16 mask = (Uint16) (~surface->format->Amask);
|
Uint16 mask = (Uint16) (~surface->format->Amask);
|
||||||
@ -377,13 +378,7 @@ SDL_ConvertColorkeyToAlpha(SDL_Surface * surface, SDL_bool ignore_alpha)
|
|||||||
row += surface->pitch / 2;
|
row += surface->pitch / 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} else if (bpp == 4) {
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
/* FIXME */
|
|
||||||
break;
|
|
||||||
case 4:
|
|
||||||
{
|
|
||||||
Uint32 *row, *spot;
|
Uint32 *row, *spot;
|
||||||
Uint32 ckey = surface->map->info.colorkey;
|
Uint32 ckey = surface->map->info.colorkey;
|
||||||
Uint32 mask = ~surface->format->Amask;
|
Uint32 mask = ~surface->format->Amask;
|
||||||
@ -416,8 +411,6 @@ SDL_ConvertColorkeyToAlpha(SDL_Surface * surface, SDL_bool ignore_alpha)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
SDL_UnlockSurface(surface);
|
SDL_UnlockSurface(surface);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user