drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge changes from the witness.

Browse Source
This commit is contained in:
castano
2011-10-10 20:24:12 +00:00
parent 94401919b8
commit 2ec37026be
35 changed files with 9420 additions and 9328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvcore/Debug.cpp
View File

@ -453,7 +453,7 @@ namespace
{
MSG msg;
while( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) ) {
if( msg.message == WM_QUIT ) break;
//if( msg.message == WM_QUIT ) break;
TranslateMessage( &msg );
DispatchMessage( &msg );
}
@ -467,12 +467,11 @@ namespace
StringBuilder error_string;
if( func != NULL ) {
error_string.format( "*** Assertion failed: %s\n On file: %s\n On function: %s\n On line: %d\n ", exp, file, func, line );
nvDebug( error_string.str() );
}
else {
error_string.format( "*** Assertion failed: %s\n On file: %s\n On line: %d\n ", exp, file, line );
nvDebug( error_string.str() );
}
nvDebug( error_string.str() );
if (debug::isDebuggerPresent()) {
return NV_ABORT_DEBUG;

14
src/nvcore/Utils.h
View File

@ -70,15 +70,11 @@ namespace nv
b = temp;
}
/// Return the maximum of the two arguments.
/// Return the maximum of the two arguments. For floating point values, it returns the second value if the first is NaN.
template <typename T>
inline const T & max(const T & a, const T & b)
{
//return std::max(a, b);
if( a < b ) {
return b;
}
return a;
return (b < a) ? a : b;
}
/// Return the maximum of the three arguments.
@ -92,11 +88,7 @@ namespace nv
template <typename T>
inline const T & min(const T & a, const T & b)
{
//return std::min(a, b);
if( b < a ) {
return b;
}
return a;
return (a < b) ? a : b;
}
/// Return the maximum of the three arguments.