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

Fix build breaks (#453)

Browse Source
This commit is contained in:
Chuck Walbourn 2024-02-15 11:13:53 -08:00 committed by GitHub
parent 1e7961387a
commit 726cd6de90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Texassemble/texassemble.cpp
View File

@ -1875,7 +1875,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
targetHeight /= mipdiv; targetHeight /= mipdiv;
if (targetWidth == 0 || targetHeight == 0) if (targetWidth == 0 || targetHeight == 0)
{ {
wprintf(L"\nERROR: Too many input mips provided. For the dimensions of the first mip provided, only %u input mips can be used.\n", conversionIndex); wprintf(L"\nERROR: Too many input mips provided. For the dimensions of the first mip provided, only %zu input mips can be used.\n", conversionIndex);
return 1; return 1;
} }
} }
@ -2615,7 +2615,6 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
case CMD_FROM_MIPS: case CMD_FROM_MIPS:
{ {
auto src = loadedImages.cbegin(); auto src = loadedImages.cbegin();
auto img = (*src)->GetImage(0, 0, 0);
ScratchImage result; ScratchImage result;
hr = result.Initialize2D(format, width, height, 1, images); hr = result.Initialize2D(format, width, height, 1, images);
if (FAILED(hr)) if (FAILED(hr))
@ -2642,19 +2641,19 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
mipdiv *= 2; mipdiv *= 2;
} }
// Write texture2D // Write texture2D
wprintf(L"\nWriting %ls ", szOutputFile); wprintf(L"\nWriting %ls ", outputFile.c_str());
PrintInfo(result.GetMetadata()); PrintInfo(result.GetMetadata());
wprintf(L"\n"); wprintf(L"\n");
fflush(stdout); fflush(stdout);
if (dwOptions & (1 << OPT_TOLOWER)) if (dwOptions & (1 << OPT_TOLOWER))
{ {
std::ignore = _wcslwr_s(szOutputFile); std::transform(outputFile.begin(), outputFile.end(), outputFile.begin(), towlower);
} }
if (~dwOptions & (1 << OPT_OVERWRITE)) if (~dwOptions & (1 << OPT_OVERWRITE))
{ {
if (GetFileAttributesW(szOutputFile) != INVALID_FILE_ATTRIBUTES) if (GetFileAttributesW(outputFile.c_str()) != INVALID_FILE_ATTRIBUTES)
{ {
wprintf(L"\nERROR: Output file already exists, use -y to overwrite\n"); wprintf(L"\nERROR: Output file already exists, use -y to overwrite\n");
return 1; return 1;
@ -2663,7 +2662,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
hr = SaveToDDSFile(result.GetImages(), result.GetImageCount(), result.GetMetadata(), hr = SaveToDDSFile(result.GetImages(), result.GetImageCount(), result.GetMetadata(),
(dwOptions & (1 << OPT_USE_DX10)) ? (DDS_FLAGS_FORCE_DX10_EXT | DDS_FLAGS_FORCE_DX10_EXT_MISC2) : DDS_FLAGS_NONE, (dwOptions & (1 << OPT_USE_DX10)) ? (DDS_FLAGS_FORCE_DX10_EXT | DDS_FLAGS_FORCE_DX10_EXT_MISC2) : DDS_FLAGS_NONE,
szOutputFile); outputFile.c_str());
if (FAILED(hr)) if (FAILED(hr))
{ {
wprintf(L"\nFAILED (%08X%ls)\n", static_cast<unsigned int>(hr), GetErrorDesc(hr)); wprintf(L"\nFAILED (%08X%ls)\n", static_cast<unsigned int>(hr), GetErrorDesc(hr));