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/RageBitmapTexture.cpp
+5 -5
View File
@@ -27,8 +27,8 @@ static void GetResolutionFromFileName( RString sPath, int &iWidth, int &iHeight
return;
// Check for nonsense values. Some people might not intend the hint. -Kyz
int maybe_width= StringToInt(asMatches[0]);
int maybe_height= StringToInt(asMatches[1]);
int maybe_width= std::stoi(asMatches[0]);
int maybe_height= std::stoi(asMatches[1]);
if(maybe_width <= 0 || maybe_height <= 0)
{
return;
@@ -72,7 +72,7 @@ void RageBitmapTexture::Create()
/* Load the image into a RageSurface. */
RString error;
RageSurface *pImg= NULL;
RageSurface *pImg = nullptr;
if(actualID.filename == TEXTUREMAN->GetScreenTextureID().filename)
{
pImg= TEXTUREMAN->GetScreenSurface();
@@ -83,14 +83,14 @@ void RageBitmapTexture::Create()
}
/* Tolerate corrupt/unknown images. */
if( pImg == NULL )
if( pImg == nullptr )
{
RString warning = ssprintf("RageBitmapTexture: Couldn't load %s: %s",
actualID.filename.c_str(), error.c_str());
LOG->Warn("%s", warning.c_str());
Dialog::OK(warning, "missing_texture");
pImg = RageSurfaceUtils::MakeDummySurface( 64, 64 );
ASSERT( pImg != NULL );
ASSERT( pImg != nullptr );
}
if( actualID.bHotPinkColorKey )