From 2324cb0dc49ddce9fe06ee3c1b436901f0507e72 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sat, 31 Jul 2021 17:03:54 -0700 Subject: [PATCH] Fixed texconv to default to lower-case extension --- Texconv/texconv.cpp | 30 ++++++++++++++--------------- Texdiag/texdiag.cpp | 46 ++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp index 90c9c40..0f6ece1 100644 --- a/Texconv/texconv.cpp +++ b/Texconv/texconv.cpp @@ -425,22 +425,22 @@ namespace const SValue g_pSaveFileTypes[] = // valid formats to write to { - { L"BMP", WIC_CODEC_BMP }, - { L"JPG", WIC_CODEC_JPEG }, - { L"JPEG", WIC_CODEC_JPEG }, - { L"PNG", WIC_CODEC_PNG }, - { L"DDS", CODEC_DDS }, - { L"TGA", CODEC_TGA }, - { L"HDR", CODEC_HDR }, - { L"TIF", WIC_CODEC_TIFF }, - { L"TIFF", WIC_CODEC_TIFF }, - { L"WDP", WIC_CODEC_WMP }, - { L"HDP", CODEC_HDP }, - { L"JXR", CODEC_JXR }, - { L"PPM", CODEC_PPM }, - { L"PFM", CODEC_PFM }, + { L"bmp", WIC_CODEC_BMP }, + { L"jpg", WIC_CODEC_JPEG }, + { L"jpeg", WIC_CODEC_JPEG }, + { L"png", WIC_CODEC_PNG }, + { L"dds", CODEC_DDS }, + { L"tga", CODEC_TGA }, + { L"hdr", CODEC_HDR }, + { L"tif", WIC_CODEC_TIFF }, + { L"tiff", WIC_CODEC_TIFF }, + { L"wdp", WIC_CODEC_WMP }, + { L"hdp", CODEC_HDP }, + { L"jxr", CODEC_JXR }, + { L"ppm", CODEC_PPM }, + { L"pfm", CODEC_PFM }, #ifdef USE_OPENEXR - { L"EXR", CODEC_EXR }, + { L"exr", CODEC_EXR }, #endif { nullptr, CODEC_DDS } }; diff --git a/Texdiag/texdiag.cpp b/Texdiag/texdiag.cpp index 0e1b612..019782a 100644 --- a/Texdiag/texdiag.cpp +++ b/Texdiag/texdiag.cpp @@ -335,37 +335,37 @@ const SValue g_pFilters[] = const SValue g_pDumpFileTypes[] = { - { L"BMP", WIC_CODEC_BMP }, - { L"JPG", WIC_CODEC_JPEG }, - { L"JPEG", WIC_CODEC_JPEG }, - { L"PNG", WIC_CODEC_PNG }, - { L"TGA", CODEC_TGA }, - { L"HDR", CODEC_HDR }, - { L"TIF", WIC_CODEC_TIFF }, - { L"TIFF", WIC_CODEC_TIFF }, - { L"JXR", WIC_CODEC_WMP }, + { L"bmp", WIC_CODEC_BMP }, + { L"jpg", WIC_CODEC_JPEG }, + { L"jpeg", WIC_CODEC_JPEG }, + { L"png", WIC_CODEC_PNG }, + { L"tga", CODEC_TGA }, + { L"hdr", CODEC_HDR }, + { L"tif", WIC_CODEC_TIFF }, + { L"tiff", WIC_CODEC_TIFF }, + { L"jxr", WIC_CODEC_WMP }, #ifdef USE_OPENEXR - { L"EXR", CODEC_EXR }, + { L"exr", CODEC_EXR }, #endif { nullptr, CODEC_DDS } }; const SValue g_pExtFileTypes[] = { - { L".BMP", WIC_CODEC_BMP }, - { L".JPG", WIC_CODEC_JPEG }, - { L".JPEG", WIC_CODEC_JPEG }, - { L".PNG", WIC_CODEC_PNG }, - { L".DDS", CODEC_DDS }, - { L".TGA", CODEC_TGA }, - { L".HDR", CODEC_HDR }, - { L".TIF", WIC_CODEC_TIFF }, - { L".TIFF", WIC_CODEC_TIFF }, - { L".WDP", WIC_CODEC_WMP }, - { L".HDP", WIC_CODEC_WMP }, - { L".JXR", WIC_CODEC_WMP }, + { L".bmp", WIC_CODEC_BMP }, + { L".jpg", WIC_CODEC_JPEG }, + { L".jpeg", WIC_CODEC_JPEG }, + { L".png", WIC_CODEC_PNG }, + { L".dds", CODEC_DDS }, + { L".tga", CODEC_TGA }, + { L".hdr", CODEC_HDR }, + { L".tif", WIC_CODEC_TIFF }, + { L".tiff", WIC_CODEC_TIFF }, + { L".wdp", WIC_CODEC_WMP }, + { L".hdp", WIC_CODEC_WMP }, + { L".jxr", WIC_CODEC_WMP }, #ifdef USE_OPENEXR - { L"EXR", CODEC_EXR }, + { L"exr", CODEC_EXR }, #endif { nullptr, CODEC_DDS } };