From fb90cda1e2c7b95594310c851321e912d6dfaf4f Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <chuckw@microsoft.com>
Date: Fri, 4 Jun 2021 15:06:31 -0700
Subject: [PATCH] Minor warning fixes

---
 Texassemble/texassemble.cpp | 10 +++++-----
 Texconv/texconv.cpp         |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Texassemble/texassemble.cpp b/Texassemble/texassemble.cpp
index fb47c51..bf264b0 100644
--- a/Texassemble/texassemble.cpp
+++ b/Texassemble/texassemble.cpp
@@ -2102,35 +2102,35 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
         case CMD_CUBE:
             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;
 
         case CMD_VOLUME:
             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;
 
         case CMD_ARRAY:
             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;
 
         case CMD_CUBEARRAY:
             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;
 
         default:
             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;
         }
diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp
index e3d181b..ad43369 100644
--- a/Texconv/texconv.cpp
+++ b/Texconv/texconv.cpp
@@ -1714,7 +1714,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                 break;
 
             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("\n");
@@ -3635,7 +3635,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
 
     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)