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

Supress msvc warning.

Browse Source 
Replace tabs with spaces.
This commit is contained in:
castano 2011-02-25 09:51:09 +00:00
parent 71b88deb2a
commit b72a69f25c
3 changed files with 206 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvcore/Debug.cpp
View File

@ -174,6 +174,8 @@ namespace
return i - skip; return i - skip;
} }
#pragma warning(push)
#pragma warning(disable:4748)
static NV_NOINLINE int backtrace(void * trace[], int maxcount) { static NV_NOINLINE int backtrace(void * trace[], int maxcount) {
CONTEXT ctx = { 0 }; CONTEXT ctx = { 0 };
#if NV_CPU_X86 && !NV_CPU_X86_64 #if NV_CPU_X86 && !NV_CPU_X86_64
@ -191,7 +193,7 @@ namespace
return backtraceWithSymbols(&ctx, trace, maxcount, 1); return backtraceWithSymbols(&ctx, trace, maxcount, 1);
} }
#pragma warning(pop)
static NV_NOINLINE void printStackTrace(void * trace[], int size, int start=0) static NV_NOINLINE void printStackTrace(void * trace[], int size, int start=0)
{ {

6
src/nvimage/BlockDXT.cpp
View File

@ -32,7 +32,7 @@ using namespace nv;
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
BlockDXT1 BlockDXT1
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
uint BlockDXT1::evaluatePalette(Color32 color_array[4], bool d3d9/*= false*/) const uint BlockDXT1::evaluatePalette(Color32 color_array[4], bool d3d9/*= false*/) const
@ -255,7 +255,7 @@ inline void BlockDXT1::flip2()
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
BlockDXT3 BlockDXT3
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
void BlockDXT3::decodeBlock(ColorBlock * block, bool d3d9/*= false*/) const void BlockDXT3::decodeBlock(ColorBlock * block, bool d3d9/*= false*/) const
@ -328,7 +328,7 @@ void BlockDXT3::flip2()
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
BlockDXT5 BlockDXT5
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
void AlphaBlockDXT5::evaluatePalette(uint8 alpha[8], bool d3d9) const void AlphaBlockDXT5::evaluatePalette(uint8 alpha[8], bool d3d9) const