{
/* new source surface is 32 bit with a defined RGB ordering */
zoom_src = SDL_CreateRGBSurface(SURFACE_FLAGS, src->w, src->h, 32,
- 0x000000ff, 0x0000ff00, 0x00ff0000, 0);
+ 0x000000ff, 0x0000ff00, 0x00ff0000,
+ (src->format->Amask ? 0xff000000 : 0));
SDL_BlitSurface(src, NULL, zoom_src, NULL);
is_32bit = TRUE;
is_converted = TRUE;
zoom_dst = SDL_CreateRGBSurface(SURFACE_FLAGS, dst_width, dst_height, 32,
zoom_src->format->Rmask,
zoom_src->format->Gmask,
- zoom_src->format->Bmask, 0);
+ zoom_src->format->Bmask,
+ zoom_src->format->Amask);
}
else
{
return zoom_dst;
}
-static void SetOpaqueBitmapSurface(Bitmap *bitmap)
+static SDL_Surface *SDLGetOpaqueSurface(SDL_Surface *surface)
{
- if (bitmap == NULL)
- return;
+ SDL_Surface *new_surface;
- if (bitmap->surface)
- SDL_FreeSurface(bitmap->surface);
+ if (surface == NULL)
+ return NULL;
- if ((bitmap->surface = SDLGetNativeSurface(bitmap->surface_masked)) == NULL)
- Error(ERR_EXIT, "SDL_DisplayFormat() failed");
+ if ((new_surface = SDLGetNativeSurface(surface)) == NULL)
+ Error(ERR_EXIT, "SDLGetNativeSurface() failed");
/* remove alpha channel from native non-transparent surface, if defined */
- SDLSetAlpha(bitmap->surface, FALSE, 0);
+ SDLSetAlpha(new_surface, FALSE, 0);
/* remove transparent color from native non-transparent surface, if defined */
- SDL_SetColorKey(bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0);
+ SDL_SetColorKey(new_surface, UNSET_TRANSPARENT_PIXEL, 0);
+
+ return new_surface;
}
Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height)
{
Bitmap *dst_bitmap = CreateBitmapStruct();
- SDL_Surface **dst_surface = &dst_bitmap->surface_masked;
+ SDL_Surface *src_surface = src_bitmap->surface_masked;
+ SDL_Surface *dst_surface;
dst_width = MAX(1, dst_width); /* prevent zero bitmap width */
dst_height = MAX(1, dst_height); /* prevent zero bitmap height */
dst_bitmap->height = dst_height;
/* create zoomed temporary surface from source surface */
- *dst_surface = zoomSurface(src_bitmap->surface_masked, dst_width, dst_height);
+ dst_surface = zoomSurface(src_surface, dst_width, dst_height);
/* create native format destination surface from zoomed temporary surface */
- SDLSetNativeSurface(dst_surface);
+ SDLSetNativeSurface(&dst_surface);
/* set color key for zoomed surface from source surface, if defined */
- if (SDLHasColorKey(src_bitmap->surface_masked))
- SDL_SetColorKey(*dst_surface, SET_TRANSPARENT_PIXEL,
- SDLGetColorKey(src_bitmap->surface_masked));
+ if (SDLHasColorKey(src_surface))
+ SDL_SetColorKey(dst_surface, SET_TRANSPARENT_PIXEL,
+ SDLGetColorKey(src_surface));
/* create native non-transparent surface for opaque blitting */
- SetOpaqueBitmapSurface(dst_bitmap);
+ dst_bitmap->surface = SDLGetOpaqueSurface(dst_surface);
+
+ /* set native transparent surface for masked blitting */
+ dst_bitmap->surface_masked = dst_surface;
return dst_bitmap;
}
/* load image to temporary surface */
if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
- {
- SetError("IMG_Load(): %s", SDL_GetError());
-
- return NULL;
- }
+ Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError());
print_timestamp_time("IMG_Load");
/* create native non-transparent surface for current image */
if ((new_bitmap->surface = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
- {
- SetError("SDL_DisplayFormat(): %s", SDL_GetError());
-
- return NULL;
- }
+ Error(ERR_EXIT, "SDLGetNativeSurface() failed");
/* remove alpha channel from native non-transparent surface, if defined */
SDLSetAlpha(new_bitmap->surface, FALSE, 0);
/* remove transparent color from native non-transparent surface, if defined */
SDL_SetColorKey(new_bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0);
- print_timestamp_time("SDL_DisplayFormat (opaque)");
+ print_timestamp_time("SDLGetNativeSurface (opaque)");
UPDATE_BUSY_STATE();
/* create native transparent surface for current image */
if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
- {
- SetError("SDL_DisplayFormat(): %s", SDL_GetError());
-
- return NULL;
- }
+ Error(ERR_EXIT, "SDLGetNativeSurface() failed");
- print_timestamp_time("SDL_DisplayFormat (masked)");
+ print_timestamp_time("SDLGetNativeSurface (masked)");
UPDATE_BUSY_STATE();