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

Sync with latest CR

Browse Source
This commit is contained in:
Chuck Walbourn 2025-04-24 11:21:49 -07:00
parent 6c0bebf492
commit 5864c7af07
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Texenvmap/texenvmap.cpp
View File

@ -1089,6 +1089,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
return 0; return 0;
} }
// check for these before the command
if (('-' == argv[1][0]) && ('-' == argv[1][1])) if (('-' == argv[1][0]) && ('-' == argv[1][1]))
{ {
if (!_wcsicmp(argv[1], L"--version")) if (!_wcsicmp(argv[1], L"--version"))
@ -1121,7 +1122,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
std::list<SConversion> conversion; std::list<SConversion> conversion;
bool allowOpts = true; bool allowOpts = true;
for (int iArg = 2; iArg < argc; iArg++) for (int iArg = 2; iArg < argc; ++iArg)
{ {
PWSTR pArg = argv[iArg]; PWSTR pArg = argv[iArg];
@ -1459,7 +1460,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
for (auto pConv = conversion.begin(); pConv != conversion.end(); ++pConv) for (auto pConv = conversion.begin(); pConv != conversion.end(); ++pConv)
{ {
std::filesystem::path curpath(pConv->szSrc); std::filesystem::path curpath(pConv->szSrc);
auto const ext = curpath.extension(); const auto ext = curpath.extension();
// Load source image // Load source image
if (pConv != conversion.begin()) if (pConv != conversion.begin())
@ -1613,7 +1614,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if (FAILED(hr)) if (FAILED(hr))
{ {
wprintf(L" FAILED [converttosingleplane] (%08X%ls)\n", static_cast<unsigned int>(hr), GetErrorDesc(hr)); wprintf(L" FAILED [converttosingleplane] (%08X%ls)\n", static_cast<unsigned int>(hr), GetErrorDesc(hr));
continue; return 1;
} }
auto& tinfo = timage->GetMetadata(); auto& tinfo = timage->GetMetadata();
@ -1649,7 +1650,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if (FAILED(hr)) if (FAILED(hr))
{ {
wprintf(L" FAILED [decompress] (%08X%ls)\n", static_cast<unsigned int>(hr), GetErrorDesc(hr)); wprintf(L" FAILED [decompress] (%08X%ls)\n", static_cast<unsigned int>(hr), GetErrorDesc(hr));
continue; return 1;
} }
auto& tinfo = timage->GetMetadata(); auto& tinfo = timage->GetMetadata();
@ -1697,7 +1698,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if (FAILED(hr)) if (FAILED(hr))
{ {
wprintf(L" FAILED [demultiply alpha] (%08X%ls)\n", static_cast<unsigned int>(hr), GetErrorDesc(hr)); wprintf(L" FAILED [demultiply alpha] (%08X%ls)\n", static_cast<unsigned int>(hr), GetErrorDesc(hr));
continue; return 1;
} }
auto& tinfo = timage->GetMetadata(); auto& tinfo = timage->GetMetadata();