Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-16 15:00:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Whitespace cleanpu

Browse Source
This commit is contained in:
Chuck Walbourn 2015-07-27 12:46:54 -07:00
parent 597f7ae1e2
commit 445a3d2da4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Texconv/texconv.cpp
View File

@ -650,7 +650,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
float alphaWeight = 1.f; float alphaWeight = 1.f;
DWORD dwNormalMap = 0; DWORD dwNormalMap = 0;
float nmapAmplitude = 1.f; float nmapAmplitude = 1.f;
WCHAR szPrefix [MAX_PATH]; WCHAR szPrefix [MAX_PATH];
WCHAR szSuffix [MAX_PATH]; WCHAR szSuffix [MAX_PATH];
WCHAR szOutputDir[MAX_PATH]; WCHAR szOutputDir[MAX_PATH];
@ -951,7 +951,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
} }
} }
else else
{ {
SConversion conv; SConversion conv;
wcscpy_s(conv.szSrc, MAX_PATH, pArg); wcscpy_s(conv.szSrc, MAX_PATH, pArg);
@ -1093,7 +1093,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
DWORD wicFlags = dwFilter; DWORD wicFlags = dwFilter;
if (FileType == CODEC_DDS) if (FileType == CODEC_DDS)
wicFlags |= WIC_FLAGS_ALL_FRAMES; wicFlags |= WIC_FLAGS_ALL_FRAMES;
hr = LoadFromWICFile( pConv->szSrc, wicFlags, &info, *image ); hr = LoadFromWICFile( pConv->szSrc, wicFlags, &info, *image );
if ( FAILED(hr) ) if ( FAILED(hr) )
{ {
@ -1527,7 +1527,6 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
assert( info.miscFlags2 == tinfo.miscFlags2 ); assert( info.miscFlags2 == tinfo.miscFlags2 );
assert( info.dimension == tinfo.dimension ); assert( info.dimension == tinfo.dimension );
image.swap( timage ); image.swap( timage );
cimage.reset(); cimage.reset();
} }