Skip to content

Commit

Permalink
texconv: Portable Half Map uses .phm extension (#550)
Browse files Browse the repository at this point in the history
  • Loading branch information
walbourn authored Nov 7, 2024
1 parent 2f37de7 commit d8e9d5b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Texconv/PortablePixMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,9 @@ HRESULT __cdecl SaveToPortablePixMap(


//============================================================================
// PFM (Portable Float Map)
// PFM (Portable Float Map) / PHM (Portable Half Map)
// 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(
Expand Down
2 changes: 1 addition & 1 deletion Texconv/texconv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2121,7 +2121,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
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);
if (FAILED(hr))
Expand Down
5 changes: 4 additions & 1 deletion build/DirectXTex-OneFuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ jobs:
"UBW8.TGA",
"ucm8.tga",
"testimg.ppm",
"grad4d.pfm";
"grad4d.pfm",
"grad4d.phm",
"grad4d_mono.pfm",
"grad4d_mono.phm";
New-Item -ItemType Directory -Force -Path .drop\seeds\
Expand Down

0 comments on commit d8e9d5b

Please sign in to comment.