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/RageSurface.cpp
+22 -4
View File
@@ -90,6 +90,18 @@ bool RageSurfaceFormat::MapRGBA( uint8_t r, uint8_t g, uint8_t b, uint8_t a, uin
}
bool RageSurfaceFormat::operator== ( const RageSurfaceFormat &rhs ) const
{
if( !Equivalent(rhs) )
return false;
if( BytesPerPixel == 1 )
if( memcmp( palette, rhs.palette, sizeof(RageSurfaceFormat) ) )
return false;
return true;
}
bool RageSurfaceFormat::Equivalent( const RageSurfaceFormat &rhs ) const
{
#define COMP(a) if( a != rhs.a ) return false;
COMP( BytesPerPixel );
@@ -97,8 +109,6 @@ bool RageSurfaceFormat::operator== ( const RageSurfaceFormat &rhs ) const
COMP( Gmask );
COMP( Bmask );
COMP( Amask );
if( BytesPerPixel == 1 )
COMP( palette );
return true;
}
@@ -107,6 +117,7 @@ RageSurface::RageSurface()
{
format = &fmt;
pixels = NULL;
pixels_owned = true;
}
RageSurface::RageSurface( const RageSurface &cpy )
@@ -117,8 +128,14 @@ RageSurface::RageSurface( const RageSurface &cpy )
h = cpy.h;
pitch = cpy.pitch;
flags = cpy.flags;
pixels = new uint8_t[ pitch*h ];
memcpy( pixels, cpy.pixels, pitch*h );
pixels_owned = true;
if( cpy.pixels )
{
pixels = new uint8_t[ pitch*h ];
memcpy( pixels, cpy.pixels, pitch*h );
}
else
pixels = NULL;
}
RageSurface::~RageSurface()
@@ -223,6 +240,7 @@ RageSurface *CreateSurfaceFrom( int width, int height, int BitsPerPixel, uint32_
pImg->flags = 0;
pImg->pitch = pitch;
pImg->pixels = pPixels;
pImg->pixels_owned = false;
return pImg;
}