pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

You can use SDL_ConvertSurfaceFormat() now

Browse source 
Also, icon is guaranteed not to be NULL going into this function.
This commit is contained in:
Sam Lantinga 2011-02-28 21:58:37 -08:00
parent 5b710cfee4
commit 8457ab1e62
1 changed files with 37 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/video/windows/SDL_windowswindow.c
View file

@ -286,12 +286,9 @@ WIN_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
{ {
HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd; HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
HICON hicon = NULL; HICON hicon = NULL;
if (icon) {
BYTE *icon_bmp; BYTE *icon_bmp;
int icon_len; int icon_len;
SDL_RWops *dst; SDL_RWops *dst;
SDL_PixelFormat format;
SDL_Surface *surface; SDL_Surface *surface;
/* Create temporary bitmap buffer */ /* Create temporary bitmap buffer */
@ -317,8 +314,7 @@ WIN_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
SDL_WriteLE32(dst, 0); SDL_WriteLE32(dst, 0);
/* Convert the icon to a 32-bit surface with alpha channel */ /* Convert the icon to a 32-bit surface with alpha channel */
SDL_InitFormat(&format, SDL_PIXELFORMAT_ARGB8888); surface = SDL_ConvertSurfaceFormat(icon, SDL_PIXELFORMAT_ARGB8888, 0);
surface = SDL_ConvertSurface(icon, &format, 0);
if (surface) { if (surface) {
/* Write the pixels upside down into the bitmap buffer */ /* Write the pixels upside down into the bitmap buffer */
int y = surface->h; int y = surface->h;
@ -330,13 +326,11 @@ WIN_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
/* TODO: create the icon in WinCE (CreateIconFromResource isn't available) */ /* TODO: create the icon in WinCE (CreateIconFromResource isn't available) */
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
hicon = hicon = CreateIconFromResource(icon_bmp, icon_len, TRUE, 0x00030000);
CreateIconFromResource(icon_bmp, icon_len, TRUE, 0x00030000);
#endif #endif
} }
SDL_RWclose(dst); SDL_RWclose(dst);
SDL_stack_free(icon_bmp); SDL_stack_free(icon_bmp);
}
/* Set the icon for the window */ /* Set the icon for the window */
SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM) hicon); SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM) hicon);