Skip to content

Commit d8e9d5b

Browse files
authored
texconv: Portable Half Map uses .phm extension (#550)
1 parent 2f37de7 commit d8e9d5b

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Texconv/PortablePixMap.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,9 @@ HRESULT __cdecl SaveToPortablePixMap(
449449

450450

451451
//============================================================================
452-
// PFM (Portable Float Map)
452+
// PFM (Portable Float Map) / PHM (Portable Half Map)
453453
// http://paulbourke.net/dataformats/pbmhdr/
454-
// https://oyranos.org/2015/03/portable-float-map-with-16-bit-half/index.html
454+
// https://github.com/syoyo/libphm
455455
//============================================================================
456456

457457
HRESULT __cdecl LoadFromPortablePixMapHDR(

Texconv/texconv.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2121,7 +2121,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
21212121
continue;
21222122
}
21232123
}
2124-
else if (_wcsicmp(ext.c_str(), L".pfm") == 0)
2124+
else if (_wcsicmp(ext.c_str(), L".pfm") == 0 || _wcsicmp(ext.c_str(), L".phm") == 0)
21252125
{
21262126
hr = LoadFromPortablePixMapHDR(curpath.c_str(), &info, *image);
21272127
if (FAILED(hr))

build/DirectXTex-OneFuzz.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ jobs:
104104
"UBW8.TGA",
105105
"ucm8.tga",
106106
"testimg.ppm",
107-
"grad4d.pfm";
107+
"grad4d.pfm",
108+
"grad4d.phm",
109+
"grad4d_mono.pfm",
110+
"grad4d_mono.phm";
108111
109112
New-Item -ItemType Directory -Force -Path .drop\seeds\
110113

0 commit comments

Comments
 (0)