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

Better error reporting in allocating a pixel format.

Browse source
This commit is contained in:
Sam Lantinga 2011-03-06 21:49:52 -08:00
parent a1ac5f42e0
commit d8392622bb
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/video/SDL_pixels.c
View file

@ -85,7 +85,7 @@ SDL_PixelFormatEnumToMasks(Uint32 format, int *bpp, Uint32 * Rmask,
/* This function doesn't work with FourCC pixel formats */ /* This function doesn't work with FourCC pixel formats */
if (SDL_ISPIXELFORMAT_FOURCC(format)) { if (SDL_ISPIXELFORMAT_FOURCC(format)) {
SDL_SetError("Unknown pixel format"); SDL_SetError("FOURCC pixel formats are not supported");
return SDL_FALSE; return SDL_FALSE;
} }
@ -418,11 +418,6 @@ SDL_AllocFormat(Uint32 pixel_format)
{ {
SDL_PixelFormat *format; SDL_PixelFormat *format;
if (SDL_ISPIXELFORMAT_FOURCC(pixel_format)) {
SDL_SetError("FOURCC pixel formats are not supported");
return NULL;
}
/* Look it up in our list of previously allocated formats */ /* Look it up in our list of previously allocated formats */
for (format = formats; format; format = format->next) { for (format = formats; format; format = format->next) {
if (pixel_format == format->format) { if (pixel_format == format->format) {
@ -435,9 +430,12 @@ SDL_AllocFormat(Uint32 pixel_format)
format = SDL_malloc(sizeof(*format)); format = SDL_malloc(sizeof(*format));
if (format == NULL) { if (format == NULL) {
SDL_OutOfMemory(); SDL_OutOfMemory();
return (NULL); return NULL;
}
if (SDL_InitFormat(format, pixel_format) < 0) {
SDL_free(format);
return NULL;
} }
SDL_InitFormat(format, pixel_format);
if (!SDL_ISPIXELFORMAT_INDEXED(pixel_format)) { if (!SDL_ISPIXELFORMAT_INDEXED(pixel_format)) {
/* Cache the RGB formats */ /* Cache the RGB formats */
@ -456,7 +454,6 @@ SDL_InitFormat(SDL_PixelFormat * format, Uint32 pixel_format)
if (!SDL_PixelFormatEnumToMasks(pixel_format, &bpp, if (!SDL_PixelFormatEnumToMasks(pixel_format, &bpp,
&Rmask, &Gmask, &Bmask, &Amask)) { &Rmask, &Gmask, &Bmask, &Amask)) {
SDL_SetError("Unknown pixel format");
return -1; return -1;
} }