Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-08 13:56:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Retire Windows 8.1 Store, Windows phone 8.1. and VS 2013 projects (#96)

Browse Source 
* Retire VS 2013 projects
* Cleaned up warning suppression
* Use ``noexcept`` instead of ``throw()``
* Can use ``%zu`` instead of ``%Iu``
* More uniform initialization
This commit is contained in:
Chuck Walbourn
2018-05-01 17:34:54 -07:00
committed by GitHub
parent 99cf8e712d
commit e62bbb24f8
32 changed files with 64 additions and 3789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Texconv/texconv.cpp
View File

@@ -574,16 +574,16 @@ namespace
void PrintInfo(const TexMetadata& info)
{
wprintf(L" (%Iux%Iu", info.width, info.height);
wprintf(L" (%zux%zu", info.width, info.height);
if (TEX_DIMENSION_TEXTURE3D == info.dimension)
wprintf(L"x%Iu", info.depth);
wprintf(L"x%zu", info.depth);
if (info.mipLevels > 1)
wprintf(L",%Iu", info.mipLevels);
wprintf(L",%zu", info.mipLevels);
if (info.arraySize > 1)
wprintf(L",%Iu", info.arraySize);
wprintf(L",%zu", info.arraySize);
wprintf(L" ");
PrintFormat(info.format);
@@ -1194,7 +1194,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
switch (dwOption)
{
case OPT_WIDTH:
if (swscanf_s(pValue, L"%Iu", &width) != 1)
if (swscanf_s(pValue, L"%zu", &width) != 1)
{
wprintf(L"Invalid value specified with -w (%ls)\n", pValue);
wprintf(L"\n");
@@ -1204,7 +1204,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
break;
case OPT_HEIGHT:
if (swscanf_s(pValue, L"%Iu", &height) != 1)
if (swscanf_s(pValue, L"%zu", &height) != 1)
{
wprintf(L"Invalid value specified with -h (%ls)\n", pValue);
printf("\n");
@@ -1214,7 +1214,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
break;
case OPT_MIPLEVELS:
if (swscanf_s(pValue, L"%Iu", &mipLevels) != 1)
if (swscanf_s(pValue, L"%zu", &mipLevels) != 1)
{
wprintf(L"Invalid value specified with -m (%ls)\n", pValue);
wprintf(L"\n");