Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

texconv: Portable Half Map uses .phm extension #550

Merged
merged 2 commits into from
Nov 7, 2024
Merged

texconv: Portable Half Map uses .phm extension #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bfde2d
Portable Half Map uses .phm extension
walbourn Nov 7, 2024
65376f1
Add a few more seed files to onefuzz
walbourn Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Texconv/PortablePixMap.cpp
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading