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

Minor warning fixes

Browse Source
This commit is contained in:
Chuck Walbourn 2021-06-04 15:06:31 -07:00
parent 42ce4fe69d
commit fb90cda1e2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Texassemble/texassemble.cpp
View File

@ -2102,35 +2102,35 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
case CMD_CUBE: case CMD_CUBE:
if (imageArray[0].width > maxCube || imageArray[0].height > maxCube) if (imageArray[0].width > maxCube || imageArray[0].height > maxCube)
{ {
wprintf(L"\nWARNING: Target size exceeds maximum cube dimensions for feature level (%lu)\n", maxCube); wprintf(L"\nWARNING: Target size exceeds maximum cube dimensions for feature level (%u)\n", maxCube);
} }
break; break;
case CMD_VOLUME: case CMD_VOLUME:
if (imageArray[0].width > maxVolume || imageArray[0].height > maxVolume || imageArray.size() > maxVolume) if (imageArray[0].width > maxVolume || imageArray[0].height > maxVolume || imageArray.size() > maxVolume)
{ {
wprintf(L"\nWARNING: Target size exceeds volume extent for feature level (%lu)\n", maxVolume); wprintf(L"\nWARNING: Target size exceeds volume extent for feature level (%u)\n", maxVolume);
} }
break; break;
case CMD_ARRAY: case CMD_ARRAY:
if (imageArray[0].width > maxSize || imageArray[0].height > maxSize || imageArray.size() > maxArray) if (imageArray[0].width > maxSize || imageArray[0].height > maxSize || imageArray.size() > maxArray)
{ {
wprintf(L"\nWARNING: Target size exceeds maximum size for feature level (size %lu, array %lu)\n", maxSize, maxArray); wprintf(L"\nWARNING: Target size exceeds maximum size for feature level (size %u, array %u)\n", maxSize, maxArray);
} }
break; break;
case CMD_CUBEARRAY: case CMD_CUBEARRAY:
if (imageArray[0].width > maxCube || imageArray[0].height > maxCube || imageArray.size() > maxArray) if (imageArray[0].width > maxCube || imageArray[0].height > maxCube || imageArray.size() > maxArray)
{ {
wprintf(L"\nWARNING: Target size exceeds maximum cube dimensions for feature level (size %lu, array %lu)\n", maxCube, maxArray); wprintf(L"\nWARNING: Target size exceeds maximum cube dimensions for feature level (size %u, array %u)\n", maxCube, maxArray);
} }
break; break;
default: default:
if (imageArray[0].width > maxSize || imageArray[0].height > maxSize) if (imageArray[0].width > maxSize || imageArray[0].height > maxSize)
{ {
wprintf(L"\nWARNING: Target size exceeds maximum size for feature level (%lu)\n", maxSize); wprintf(L"\nWARNING: Target size exceeds maximum size for feature level (%u)\n", maxSize);
} }
break; break;
} }

4
Texconv/texconv.cpp
View File

@ -1714,7 +1714,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
break; break;
case OPT_COLORKEY: case OPT_COLORKEY:
if (swscanf_s(pValue, L"%lx", &colorKey) != 1) if (swscanf_s(pValue, L"%x", &colorKey) != 1)
{ {
printf("Invalid value specified with -c (%ls)\n", pValue); printf("Invalid value specified with -c (%ls)\n", pValue);
printf("\n"); printf("\n");
@ -3635,7 +3635,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if (sizewarn) if (sizewarn)
{ {
wprintf(L"\nWARNING: Target size exceeds maximum size for feature level (%lu)\n", maxSize); wprintf(L"\nWARNING: Target size exceeds maximum size for feature level (%u)\n", maxSize);
} }
if (nonpow2warn && maxSize <= 4096) if (nonpow2warn && maxSize <= 4096)