OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Use std::min and std::max

Browse Source
This commit is contained in:
Michael Hansen
2014-07-22 21:12:09 -07:00
parent 4f5a941d41
commit e36220cca5
35 changed files with 101 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
View File

@ -133,7 +133,7 @@ void plDispatchLog::DumpMsg(plMessage* msg, int numReceivers, int sendTimeMs, in
float sendTime = hsTimer::GetMilliSeconds<float>(hsTimer::GetTicks() - fStartTicks);
char indentStr[50];
indent = hsMinimum(indent, sizeof(indentStr)-1);
indent = std::min(indent, static_cast<int32_t>(sizeof(indentStr)-1));
memset(indentStr, ' ', indent);
indentStr[indent] = '\0';

29
Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.cpp
View File

@ -162,21 +162,20 @@ static bool ICopySourceToTexture16(BITMAPINFO* bmi, plMipmap* b)
uint32_t* pix = (uint32_t*)b->GetImage();
pix += b->GetWidth() * b->GetHeight();
int width = bmi->bmiHeader.biWidth;
int height = bmi->bmiHeader.biHeight;
uint32_t width = bmi->bmiHeader.biWidth;
uint32_t height = bmi->bmiHeader.biHeight;
int useHeight = hsMinimum(height, b->GetHeight());
int useWidth = hsMinimum(width, b->GetWidth());
int i;
for( i = 0; i < useHeight; i++ )
uint32_t useHeight = std::min(height, b->GetHeight());
uint32_t useWidth = std::min(width, b->GetWidth());
for (uint32_t i = 0; i < useHeight; i++)
{
uint16_t* src = pSrc;
pSrc += width;
pix -= b->GetWidth();
uint32_t* tPix = pix;
int j;
for( j = 0; j < useWidth; j++ )
for (uint32_t j = 0; j < useWidth; j++)
{
*tPix = ((*src & 0x001f) << 3) // up 3
| ((*src & 0x03e0) << 6) // down 5 up 3 up 8
@ -199,22 +198,20 @@ static bool ICopySourceToTexture24(BITMAPINFO* bmi, plMipmap* b)
hsRGBAColor32* pix = (hsRGBAColor32*)b->GetImage();
pix += b->GetWidth() * b->GetHeight();
int width = bmi->bmiHeader.biWidth;
int height = bmi->bmiHeader.biHeight;
uint32_t width = bmi->bmiHeader.biWidth;
uint32_t height = bmi->bmiHeader.biHeight;
int useHeight = hsMinimum(height, b->GetHeight());
int useWidth = hsMinimum(width, b->GetWidth());
int i;
uint32_t useHeight = std::min(height, b->GetHeight());
uint32_t useWidth = std::min(width, b->GetWidth());
for( i = 0; i < useHeight; i++ )
for (uint32_t i = 0; i < useHeight; i++)
{
unsigned char* src = pSrc;
pSrc += width * 3;
pix -= b->GetWidth();
hsRGBAColor32* tPix = pix;
int j;
for( j = 0; j < useWidth; j++ )
for (uint32_t j = 0; j < useWidth; j++)
{
tPix->b = *src++;
tPix->g = *src++;