return zoom_dst;
}
+static void SetOpaqueBitmapSurface(Bitmap *bitmap)
+{
+ if (bitmap == NULL)
+ return;
+
+ if (bitmap->surface)
+ SDL_FreeSurface(bitmap->surface);
+
+ if ((bitmap->surface = SDLGetNativeSurface(bitmap->surface_masked)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed");
+
+ /* remove alpha channel from native non-transparent surface, if defined */
+ SDLSetAlpha(bitmap->surface, FALSE, 0);
+
+ /* remove transparent color from native non-transparent surface, if defined */
+ SDL_SetColorKey(bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0);
+}
+
Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height)
{
Bitmap *dst_bitmap = CreateBitmapStruct();
- SDL_Surface **dst_surface = &dst_bitmap->surface;
+ SDL_Surface **dst_surface = &dst_bitmap->surface_masked;
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, dst_width, dst_height);
+ *dst_surface = zoomSurface(src_bitmap->surface_masked, dst_width, dst_height);
/* create native format destination surface from zoomed temporary 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));
+
+ /* create native non-transparent surface for opaque blitting */
+ SetOpaqueBitmapSurface(dst_bitmap);
+
return dst_bitmap;
}
return NULL;
}
+ /* 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)");
UPDATE_BUSY_STATE();
- /* create native transparent surface for current image */
- if (sdl_image_tmp->format->Amask == 0)
+ /* set black pixel to transparent if no alpha channel / transparent color */
+ if (!SDLHasAlpha(sdl_image_tmp) &&
+ !SDLHasColorKey(sdl_image_tmp))
SDL_SetColorKey(sdl_image_tmp, SET_TRANSPARENT_PIXEL,
SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00));
+ /* create native transparent surface for current image */
if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
{
SetError("SDL_DisplayFormat(): %s", SDL_GetError());