From 3bfde2d79b81c21bd6fdb28e4a1ae8b7dc6111f7 Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <chuckw@microsoft.com>
Date: Wed, 6 Nov 2024 21:57:42 -0800
Subject: [PATCH 1/2] Portable Half Map uses .phm extension
---
Texconv/PortablePixMap.cpp | 4 ++--
Texconv/texconv.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Texconv/PortablePixMap.cpp b/Texconv/PortablePixMap.cpp
index 085b420c..f293280a 100644
--- a/Texconv/PortablePixMap.cpp
+++ b/Texconv/PortablePixMap.cpp
@@ -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(
diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp
index 653a1cc1..24dcf3de 100644
--- a/Texconv/texconv.cpp
+++ b/Texconv/texconv.cpp
@@ -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))
From 65376f1400cd803f5dfc9871eebf4cb6c768dc8a Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <chuckw@microsoft.com>
Date: Wed, 6 Nov 2024 22:43:08 -0800
Subject: [PATCH 2/2] Add a few more seed files to onefuzz
---
build/DirectXTex-OneFuzz.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/build/DirectXTex-OneFuzz.yml b/build/DirectXTex-OneFuzz.yml
index ff0919c0..bd453105 100644
--- a/build/DirectXTex-OneFuzz.yml
+++ b/build/DirectXTex-OneFuzz.yml
@@ -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\