actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

palette handling fixes

Browse Source 
don't free pixels passed to CreateSurfaceFrom
This commit is contained in:
Glenn Maynard
2004-07-14 21:02:49 +00:00
parent 2fe0d2021e
commit 17bc5b0025
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSurfaceUtils.cpp
+4 -4
View File
@@ -137,8 +137,8 @@ void RageSurfaceUtils::CopySurface( RageSurface *src, RageSurface *dest )
/* Copy the palette, if we have one. */
if( src->format->BitsPerPixel == 8 && dest->format->BitsPerPixel == 8 )
{
ASSERT( dest->format->palette );
dest->fmt.palette = src->fmt.palette;
ASSERT( dest->fmt.palette );
*dest->fmt.palette = *src->fmt.palette;
}
Blit( src, dest, -1, -1, false );
@@ -150,8 +150,8 @@ bool RageSurfaceUtils::ConvertSurface( RageSurface *src, RageSurface *&dst,
{
dst = CreateSurface( width, height, bpp, R, G, B, A );
/* If the formats are the same, no conversion is needed. */
if( width == src->w && height == src->h && src->format == dst->format )
/* If the formats are the same, no conversion is needed. Ignore the palette. */
if( width == src->w && height == src->h && src->format->Equivalent( *dst->format ) )
{
delete dst;
dst = NULL;