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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSurface_Load_PNG.cpp
+19 -19
View File
@@ -75,37 +75,37 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
png_struct *png = png_create_read_struct( PNG_LIBPNG_VER_STRING, &error, PNG_Error, PNG_Warning );
if( png == NULL )
if( png == nullptr )
{
sprintf( errorbuf, "creating png_create_read_struct failed");
return NULL;
return nullptr;
}
png_info *info_ptr = png_create_info_struct(png);
if( info_ptr == NULL )
if( info_ptr == nullptr )
{
png_destroy_read_struct( &png, NULL, NULL );
png_destroy_read_struct( &png, nullptr, nullptr );
sprintf( errorbuf, "creating png_create_info_struct failed");
return NULL;
return nullptr;
}
RageSurface *volatile img = NULL;
RageSurface *volatile img = nullptr;
CHECKPOINT_M("Potential issue with png jump about to be analyzed.");
png_byte** row_pointers= NULL;
png_byte** row_pointers= nullptr;
// Throwing an exception in the error callback would make the exception
// pass through C code, which is undefined behavior. Works fine on Linux,
// and on OS X with C++11, but does not work on OS X without C++11. -Kyz
if(setjmp(png_jmpbuf(png)))
{
png_destroy_read_struct(&png, &info_ptr, NULL);
png_destroy_read_struct(&png, &info_ptr, nullptr);
delete img;
if(row_pointers != NULL)
if(row_pointers != nullptr)
{
delete[] row_pointers;
}
return NULL;
return nullptr;
}
png_set_read_fn( png, f, RageFile_png_read );
@@ -114,15 +114,15 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
png_uint_32 width, height;
int bit_depth, color_type;
png_get_IHDR( png, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL );
png_get_IHDR( png, info_ptr, &width, &height, &bit_depth, &color_type, nullptr, nullptr, nullptr );
/* If bHeaderOnly is true, don't allocate the pixel storage space or decompress
* the image. Just return an empty surface with only the width and height set. */
if( bHeaderOnly )
{
CHECKPOINT_M("Header only png about to be processed.");
img = CreateSurfaceFrom( width, height, 32, 0, 0, 0, 0, NULL, width*4 );
png_destroy_read_struct( &png, &info_ptr, NULL );
img = CreateSurfaceFrom( width, height, 32, 0, 0, 0, 0, nullptr, width*4 );
png_destroy_read_struct( &png, &info_ptr, nullptr );
return img;
}
@@ -176,7 +176,7 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
if( color_type == PNG_COLOR_TYPE_GRAY )
{
png_color_16 *trans;
if( png_get_tRNS( png, info_ptr, NULL, NULL, &trans ) == PNG_INFO_tRNS )
if( png_get_tRNS( png, info_ptr, nullptr, nullptr, &trans ) == PNG_INFO_tRNS )
iColorKey = trans->gray;
}
else if( color_type == PNG_COLOR_TYPE_PALETTE )
@@ -186,9 +186,9 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
int ret = png_get_PLTE( png, info_ptr, &palette, &num_palette );
ASSERT( ret == PNG_INFO_PLTE );
png_byte *trans = NULL;
png_byte *trans = nullptr;
int num_trans = 0;
png_get_tRNS( png, info_ptr, &trans, &num_trans, NULL );
png_get_tRNS( png, info_ptr, &trans, &num_trans, nullptr );
for( int i = 0; i < num_palette; ++i )
{
@@ -239,7 +239,7 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
default:
FAIL_M(ssprintf( "%i", type) );
}
ASSERT( img != NULL );
ASSERT( img != nullptr );
row_pointers = new png_byte*[height];
CHECKPOINT_M( ssprintf("%p",row_pointers) );
@@ -253,7 +253,7 @@ static RageSurface *RageSurface_Load_PNG( RageFile *f, const char *fn, char erro
png_read_image( png, row_pointers );
png_read_end( png, info_ptr );
png_destroy_read_struct( &png, &info_ptr, NULL );
png_destroy_read_struct( &png, &info_ptr, nullptr );
return img;
}
@@ -271,7 +271,7 @@ RageSurfaceUtils::OpenResult RageSurface_Load_PNG( const RString &sPath, RageSur
char errorbuf[1024];
ret = RageSurface_Load_PNG( &f, sPath, errorbuf, bHeaderOnly );
if( ret == NULL )
if( ret == nullptr )
{
error = errorbuf;
return RageSurfaceUtils::OPEN_UNKNOWN_FILE_FORMAT; // XXX