Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-09 19:50:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed regression in FS70 support introduced in pull request #180

Browse Source
This commit is contained in:
Chuck Walbourn 2020-06-12 13:58:44 -07:00
parent 759caf730e
commit 80853b7771
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Texconv/ExtendedBMP.cpp
View File

@ -183,11 +183,9 @@ HRESULT __cdecl LoadFromBMPEx(
hr = LoadFromWICMemory(bmpData.get(), bmpSize, flags, metadata, image); hr = LoadFromWICMemory(bmpData.get(), bmpSize, flags, metadata, image);
if (FAILED(hr)) if (FAILED(hr))
return hr; {
hr = LoadFromExtendedBMPMemory(bmpData.get(), bmpSize, metadata, image);
}
hr = LoadFromExtendedBMPMemory(bmpData.get(), bmpSize, metadata, image); return hr;
if (FAILED(hr))
return hr;
return S_OK;
} }