oreolek/adventin
Archived
1
0
Fork 0
Code Pull requests Releases Activity

bmp again

Browse source
This commit is contained in:
p.kosyh 2010-02-17 17:48:38 +00:00
parent 474d7179a4
commit dd34feee78
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/sdl-instead/graphics.c
View file

@ -555,7 +555,6 @@ img_t gfx_combine(img_t src, img_t dst)
static img_t _gfx_load_image(char *filename)
{
SDL_Surface *img;
SDL_RWops *rwop;
int nr = 0;
if (strstr(filename,".gif") || strstr(filename,".GIF"))
nr = AG_LoadGIF(filename, NULL, 0, NULL);
@ -572,17 +571,19 @@ static img_t _gfx_load_image(char *filename)
anigif_add(agif);
return agif->frames[0].surface;
}
rwop = SDL_RWFromFile(filename, "rb");
if (!rwop)
img = IMG_Load(filename);
if (!img) {
return NULL;
img = IMG_Load_RW(rwop, 0);
if (!img)
goto out;
if (img->format->BitsPerPixel == 32 &&
IMG_isBMP(rwop))/* hack for 32 bit BMP :( */
SDL_SetAlpha(img, 0, SDL_ALPHA_OPAQUE);
out:
SDL_FreeRW(rwop);
}
if (img->format->BitsPerPixel == 32) { /* hack for 32 bit BMP :( */
SDL_RWops *rwop;
rwop = SDL_RWFromFile(filename, "rb");
if (rwop) {
if (IMG_isBMP(rwop))
SDL_SetAlpha(img, SDL_RLEACCEL, SDL_ALPHA_OPAQUE);
SDL_FreeRW(rwop);
}
}
return img;
}