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.cpp
+4 -4
View File
@@ -41,7 +41,7 @@ RageSurfaceFormat::RageSurfaceFormat():
Rmask(Mask[0]), Gmask(Mask[1]), Bmask(Mask[2]), Amask(Mask[3]),
Rshift(Shift[0]), Gshift(Shift[1]), Bshift(Shift[2]), Ashift(Shift[3])
{
palette = NULL;
palette = nullptr;
}
RageSurfaceFormat::RageSurfaceFormat( const RageSurfaceFormat &cpy ):
@@ -62,7 +62,7 @@ void RageSurfaceFormat::GetRGB( uint32_t val, uint8_t *r, uint8_t *g, uint8_t *b
{
if( BytesPerPixel == 1 )
{
ASSERT( palette != NULL );
ASSERT( palette != nullptr );
*r = palette->colors[val].r;
*g = palette->colors[val].g;
*b = palette->colors[val].b;
@@ -119,7 +119,7 @@ bool RageSurfaceFormat::Equivalent( const RageSurfaceFormat &rhs ) const
RageSurface::RageSurface()
{
format = &fmt;
pixels = NULL;
pixels = nullptr;
pixels_owned = true;
}
@@ -138,7 +138,7 @@ RageSurface::RageSurface( const RageSurface &cpy )
memcpy( pixels, cpy.pixels, pitch*h );
}
else
pixels = NULL;
pixels = nullptr;
}
RageSurface::~RageSurface()