From b68c0df6d51c28a58b21a9fa2eaf65dc237eaf72 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 30 Sep 2020 12:37:49 -0700 Subject: [PATCH] Updated tools to use TGA_FLAGS parameter --- Texassemble/texassemble.cpp | 4 ++-- Texconv/texconv.cpp | 4 ++-- Texdiag/texdiag.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Texassemble/texassemble.cpp b/Texassemble/texassemble.cpp index 5298812..2a90b3e 100644 --- a/Texassemble/texassemble.cpp +++ b/Texassemble/texassemble.cpp @@ -651,7 +651,7 @@ namespace return SaveToDDSFile(img, DDS_FLAGS_NONE, szOutputFile); case CODEC_TGA: - return SaveToTGAFile(img, szOutputFile); + return SaveToTGAFile(img, TGA_FLAGS_NONE, szOutputFile); case CODEC_HDR: return SaveToHDRFile(img, szOutputFile); @@ -1161,7 +1161,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) } else if (_wcsicmp(ext, L".tga") == 0) { - hr = LoadFromTGAFile(pConv->szSrc, &info, *image); + hr = LoadFromTGAFile(pConv->szSrc, TGA_FLAGS_NONE, &info, *image); if (FAILED(hr)) { wprintf(L" FAILED (%x)\n", static_cast(hr)); diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp index 5e78317..6bfba87 100644 --- a/Texconv/texconv.cpp +++ b/Texconv/texconv.cpp @@ -1749,7 +1749,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) } else if (_wcsicmp(ext, L".tga") == 0) { - hr = LoadFromTGAFile(pConv->szSrc, &info, *image); + hr = LoadFromTGAFile(pConv->szSrc, TGA_FLAGS_NONE, &info, *image); if (FAILED(hr)) { wprintf(L" FAILED (%x)\n", static_cast(hr)); @@ -3130,7 +3130,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) } case CODEC_TGA: - hr = SaveToTGAFile(img[0], pConv->szDest, (dwOptions & (DWORD64(1) << OPT_TGA20)) ? &info : nullptr); + hr = SaveToTGAFile(img[0], TGA_FLAGS_NONE, pConv->szDest, (dwOptions & (DWORD64(1) << OPT_TGA20)) ? &info : nullptr); break; case CODEC_HDR: diff --git a/Texdiag/texdiag.cpp b/Texdiag/texdiag.cpp index a4ecf25..8261ec3 100644 --- a/Texdiag/texdiag.cpp +++ b/Texdiag/texdiag.cpp @@ -651,7 +651,7 @@ namespace } else if (_wcsicmp(ext, L".tga") == 0) { - return LoadFromTGAFile(fileName, &info, *image); + return LoadFromTGAFile(fileName, TGA_FLAGS_NONE, &info, *image); } else if (_wcsicmp(ext, L".hdr") == 0) { @@ -685,7 +685,7 @@ namespace return SaveToDDSFile(*image, DDS_FLAGS_NONE, fileName); case CODEC_TGA: - return SaveToTGAFile(*image, fileName); + return SaveToTGAFile(*image, TGA_FLAGS_NONE, fileName); case CODEC_HDR: return SaveToHDRFile(*image, fileName);