Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Minor cleanup in patches from Coursoud

  • Loading branch information
slouken committed Sep 27, 2010
1 parent 068a47a commit e9bbe6a686dfeb16b412e0a4481bcc0afa83afbb
Showing with 4 additions and 7 deletions.
  1. +3 −6 src/SDL_compat.c
  2. +1 −1 src/video/SDL_video.c
@@ -320,12 +320,9 @@ SDL_VideoPaletteChanged(void *userdata, SDL_Palette * palette)
}
}
if (userdata == SDL_VideoSurface) {
if (SDL_SetDisplayPalette(palette->colors, 0, palette->ncolors) < 0) {
/* The display surface not necessarily needs to have a palette.
* Just do nothing here and try to set the texture palette.
*/
//return -1;
}
/* The display may not have a palette, but always set texture palette */
SDL_SetDisplayPalette(palette->colors, 0, palette->ncolors);

if (SDL_SetTexturePalette
(SDL_VideoTexture, palette->colors, 0, palette->ncolors) < 0) {
return -1;
@@ -1467,7 +1467,7 @@ SDL_DestroyWindow(SDL_Window * window)
SDL_GL_UnloadLibrary();
}

/* Now invalidate magic */
/* Now invalidate magic */
window->magic = NULL;

/* Unlink the window from the list */

0 comments on commit e9bbe6a

Please sign in to comment.