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

SDL_ConvertSurface: add an intermediate variable to remove static analysis false positive (see bug #4600)

This commit is contained in:
Sylvain 2021-08-27 14:09:47 +02:00
parent be6bee0b5a
commit 1fe9ad04be
No known key found for this signature in database
GPG Key ID: 5F87E02E5BC0939E
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/SDL_surface.c
View File

@ -1092,6 +1092,7 @@ SDL_ConvertSurface(SDL_Surface * surface, const SDL_PixelFormat * format,
int palette_ck_value = 0; int palette_ck_value = 0;
SDL_bool palette_has_alpha = SDL_FALSE; SDL_bool palette_has_alpha = SDL_FALSE;
Uint8 *palette_saved_alpha = NULL; Uint8 *palette_saved_alpha = NULL;
int palette_saved_alpha_ncolors = 0;
if (!surface) { if (!surface) {
SDL_InvalidParamError("surface"); SDL_InvalidParamError("surface");
@ -1173,8 +1174,9 @@ SDL_ConvertSurface(SDL_Surface * surface, const SDL_PixelFormat * format,
/* Set opaque and backup palette alpha values */ /* Set opaque and backup palette alpha values */
if (set_opaque) { if (set_opaque) {
int i; int i;
palette_saved_alpha = SDL_stack_alloc(Uint8, surface->format->palette->ncolors); palette_saved_alpha_ncolors = surface->format->palette->ncolors;
for (i = 0; i < surface->format->palette->ncolors; i++) { palette_saved_alpha = SDL_stack_alloc(Uint8, palette_saved_alpha_ncolors);
for (i = 0; i < palette_saved_alpha_ncolors; i++) {
palette_saved_alpha[i] = surface->format->palette->colors[i].a; palette_saved_alpha[i] = surface->format->palette->colors[i].a;
surface->format->palette->colors[i].a = SDL_ALPHA_OPAQUE; surface->format->palette->colors[i].a = SDL_ALPHA_OPAQUE;
} }
@ -1201,7 +1203,7 @@ SDL_ConvertSurface(SDL_Surface * surface, const SDL_PixelFormat * format,
/* Restore palette alpha values */ /* Restore palette alpha values */
if (palette_saved_alpha) { if (palette_saved_alpha) {
int i; int i;
for (i = 0; i < surface->format->palette->ncolors; i++) { for (i = 0; i < palette_saved_alpha_ncolors; i++) {
surface->format->palette->colors[i].a = palette_saved_alpha[i]; surface->format->palette->colors[i].a = palette_saved_alpha[i];
} }
SDL_stack_free(palette_saved_alpha); SDL_stack_free(palette_saved_alpha);