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

ApplyHotPinkColorKey: simplify, fix quick alpha enable, and disable it

Browse Source 
for now
This commit is contained in:
Glenn Maynard
2004-09-05 08:48:45 +00:00
parent d49851d12f
commit dec895409a
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSurfaceUtils.cpp
+10 -11
View File
@@ -933,26 +933,25 @@ void RageSurfaceUtils::ApplyHotPinkColorKey( RageSurface *&img )
return; return;
} }
/* RGBA. */ /* RGBA. Make sure we have alpha. */
/* Make sure we have alpha. */ if( img->format->Amask == 0 )
if( !img->format->Amask )
{ {
/* We don't have any alpha. Try to enable it without copying. */ /* We don't have any alpha. Try to enable it without copying. */
int usable_bits = (1<<img->format->BitsPerPixel)-1; /* XXX: need to scan the surface and make sure the new alpha bit is always 1 */
usable_bits &= ~img->format->Rmask; /*
usable_bits &= ~img->format->Gmask; const int used_bits = img->format->Rmask | img->format->Gmask | img->format->Bmask;
usable_bits &= ~img->format->Bmask;
for( int i = 0; img->format->Amask == 0 && i < 32; ++i ) for( int i = 0; img->format->Amask == 0 && i < img->format->BitsPerPixel; ++i )
{ {
if( usable_bits & (1<<i) ) if( (used_bits & (1<<i)) )
{ {
img->format->Amask = 1<<i; img->format->Amask = 1<<i;
img->format->Aloss = 7; img->format->Aloss = 7;
img->format->Ashift = (uint8_t) i; img->format->Ashift = (uint8_t) i;
} }
} }
*/
/* If we didn't have any free bits, convert to make room. */
if( img->format->Amask == 0 ) if( img->format->Amask == 0 )
ConvertSurface( img, img->w, img->h, ConvertSurface( img, img->w, img->h,
32, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF ); 32, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF );
@@ -970,7 +969,7 @@ void RageSurfaceUtils::ApplyHotPinkColorKey( RageSurface *&img )
for( int y = 0; y < img->h; ++y ) for( int y = 0; y < img->h; ++y )
{ {
uint8_t *row = (uint8_t *)img->pixels + img->pitch*y; uint8_t *row = img->pixels + img->pitch*y;
for( int x = 0; x < img->w; ++x ) for( int x = 0; x < img->w; ++x )
{ {