Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements

Fix whitespace changes
This commit is contained in:
Michael Sundqvist
2022-07-10 18:28:56 +03:00
committed by Martin Natano
parent f0680a29fc
commit 0cba3579de
534 changed files with 3456 additions and 3488 deletions
+5 -5
View File
@@ -49,7 +49,7 @@ static Preference<bool> g_bPalettedImageCache( "PalettedImageCache", false );
ImageCache *IMAGECACHE; // global and accessible from anywhere in our program
static map<RString,RageSurface *> g_ImagePathToImage;
static std::map<RString, RageSurface*> g_ImagePathToImage;
static int g_iDemandRefcount = 0;
RString ImageCache::GetImageCachePath( RString sImageDir ,RString sImagePath )
@@ -220,8 +220,8 @@ struct ImageTexture: public RageTexture
m_pImage->h > DISPLAY->GetMaxTextureSize() )
{
LOG->Warn( "Converted %s at runtime", GetID().filename.c_str() );
int iWidth = min( m_pImage->w, DISPLAY->GetMaxTextureSize() );
int iHeight = min( m_pImage->h, DISPLAY->GetMaxTextureSize() );
int iWidth = std::min( m_pImage->w, DISPLAY->GetMaxTextureSize() );
int iHeight = std::min( m_pImage->h, DISPLAY->GetMaxTextureSize() );
RageSurfaceUtils::Zoom( m_pImage, iWidth, iHeight );
}
@@ -392,8 +392,8 @@ void ImageCache::CacheImageInternal( RString sImageDir, RString sImagePath )
/* Don't resize the image to less than 32 pixels in either dimension or the next
* power of two of the source (whichever is smaller); it's already very low res. */
iWidth = max( iWidth, min(32, power_of_two(iSourceWidth)) );
iHeight = max( iHeight, min(32, power_of_two(iSourceHeight)) );
iWidth = std::max( iWidth, std::min(32, power_of_two(iSourceWidth)) );
iHeight = std::max( iHeight, std::min(32, power_of_two(iSourceHeight)) );
//RageSurfaceUtils::ApplyHotPinkColorKey( pImage );