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

Merge pull request #273 from 'paradox/clang'

Browse Source 
Conflicts:
	Sources/Tools/MaxConvert/Pch.h
	Sources/Tools/MaxConvert/hsControlConverter.cpp
This commit is contained in:
Adam Johnson
2013-01-31 19:14:57 -05:00
parent a8b2509736 e98a95fc94
commit f5abe4ab15
103 changed files with 211 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/Plasma/PubUtilLib/plGImage/plDynSurfaceWriter.cpp
View File

@ -960,7 +960,6 @@ uint16_t plDynSurfaceWriter::CalcStringWidth( const char *text, uint16_t *h
IEnsureSurfaceUpdated();
#if HS_BUILD_FOR_WIN32
SIZE size;
::GetTextExtentPoint32( fRGBSurface.fDC, text, strlen( text ), &size );
@ -968,6 +967,8 @@ uint16_t plDynSurfaceWriter::CalcStringWidth( const char *text, uint16_t *h
*height = (uint16_t)size.cy;
return (uint16_t)size.cx;
#else
return 0;
#endif
}

2
Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp
View File

@ -60,7 +60,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPipeline/hsGDeviceRef.h"
#include "plProfile.h"
#include "plJPEG.h"
#include <math.h>
#include <cmath>
plProfile_CreateMemCounter("Mipmaps", "Memory", MemMipmaps);