encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed assertion loading button.bmp in testgamecontroller

This commit is contained in:
Sam Lantinga 2014-03-29 12:27:27 -07:00
parent 20680d7db0
commit 229b438d42
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/testgamecontroller.c
View File

@ -85,10 +85,14 @@ LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent)
} else { } else {
/* Set transparent pixel as the pixel at (0,0) */ /* Set transparent pixel as the pixel at (0,0) */
if (transparent) { if (transparent) {
if (temp->format->BytesPerPixel == 1) {
SDL_SetColorKey(temp, SDL_TRUE, *(Uint8 *)temp->pixels);
} else {
SDL_assert(!temp->format->palette); SDL_assert(!temp->format->palette);
SDL_assert(temp->format->BitsPerPixel == 24); SDL_assert(temp->format->BitsPerPixel == 24);
SDL_SetColorKey(temp, SDL_TRUE, (*(Uint32 *)temp->pixels) & 0x00FFFFFF); SDL_SetColorKey(temp, SDL_TRUE, (*(Uint32 *)temp->pixels) & 0x00FFFFFF);
} }
}
texture = SDL_CreateTextureFromSurface(renderer, temp); texture = SDL_CreateTextureFromSurface(renderer, temp);
if (!texture) { if (!texture) {