AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-11-21 12:00:06 +00:00
Code Issues Releases Wiki Activity

texconv: Portable Half Map uses .phm extension (#550)

Browse Source
This commit is contained in:
Chuck Walbourn 2024-11-07 14:56:31 -08:00 committed by GitHub
parent 2f37de7165
commit d8e9d5b12a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Texconv/PortablePixMap.cpp
View File

@ -449,9 +449,9 @@ HRESULT __cdecl SaveToPortablePixMap(
//============================================================================ //============================================================================
// PFM (Portable Float Map) // PFM (Portable Float Map) / PHM (Portable Half Map)
// http://paulbourke.net/dataformats/pbmhdr/ // http://paulbourke.net/dataformats/pbmhdr/
// https://oyranos.org/2015/03/portable-float-map-with-16-bit-half/index.html // https://github.com/syoyo/libphm
//============================================================================ //============================================================================
HRESULT __cdecl LoadFromPortablePixMapHDR( HRESULT __cdecl LoadFromPortablePixMapHDR(

2
Texconv/texconv.cpp
View File

@ -2121,7 +2121,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
continue; continue;
} }
} }
else if (_wcsicmp(ext.c_str(), L".pfm") == 0) else if (_wcsicmp(ext.c_str(), L".pfm") == 0 || _wcsicmp(ext.c_str(), L".phm") == 0)
{ {
hr = LoadFromPortablePixMapHDR(curpath.c_str(), &info, *image); hr = LoadFromPortablePixMapHDR(curpath.c_str(), &info, *image);
if (FAILED(hr)) if (FAILED(hr))

5
build/DirectXTex-OneFuzz.yml
View File

@ -104,7 +104,10 @@ jobs:
"UBW8.TGA", "UBW8.TGA",
"ucm8.tga", "ucm8.tga",
"testimg.ppm", "testimg.ppm",
"grad4d.pfm"; "grad4d.pfm",
"grad4d.phm",
"grad4d_mono.pfm",
"grad4d_mono.phm";
New-Item -ItemType Directory -Force -Path .drop\seeds\ New-Item -ItemType Directory -Force -Path .drop\seeds\