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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2004-08-30 06:38:08 +00:00
parent f14d917560
commit d14a66b8e7
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSurface_Load_PNG.cpp
+13 -13
View File
@@ -162,19 +162,6 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
if( png_get_tRNS( png, info_ptr, NULL, NULL, &trans ) == PNG_INFO_tRNS ) if( png_get_tRNS( png, info_ptr, NULL, NULL, &trans ) == PNG_INFO_tRNS )
iColorKey = trans->gray; iColorKey = trans->gray;
} }
else if( color_type != PNG_COLOR_TYPE_PALETTE )
{
/* If we have RGB image and tRNS, it's a color key. Just convert it to RGBA. */
if( png_get_valid(png, info_ptr, PNG_INFO_tRNS) )
{
/* We don't care about RGB color keys; just convert them to alpha. */
png_set_tRNS_to_alpha( png );
type = RGBA;
}
/* RGB->RGBX */
png_set_filler( png, 0xff, PNG_FILLER_AFTER );
}
else if( color_type == PNG_COLOR_TYPE_PALETTE ) else if( color_type == PNG_COLOR_TYPE_PALETTE )
{ {
int num_palette; int num_palette;
@@ -196,6 +183,19 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
colors[i].a = trans[i]; colors[i].a = trans[i];
} }
} }
else
{
/* If we have RGB image and tRNS, it's a color key. Just convert it to RGBA. */
if( png_get_valid(png, info_ptr, PNG_INFO_tRNS) )
{
/* We don't care about RGB color keys; just convert them to alpha. */
png_set_tRNS_to_alpha( png );
type = RGBA;
}
/* RGB->RGBX */
png_set_filler( png, 0xff, PNG_FILLER_AFTER );
}
png_set_interlace_handling( png ); png_set_interlace_handling( png );