From 80853b777136e442f95eebe5f859b6b7038f27c7 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 12 Jun 2020 13:58:44 -0700 Subject: [PATCH] Fixed regression in FS70 support introduced in pull request #180 --- Texconv/ExtendedBMP.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Texconv/ExtendedBMP.cpp b/Texconv/ExtendedBMP.cpp index 35ec10e..0b5e7dc 100644 --- a/Texconv/ExtendedBMP.cpp +++ b/Texconv/ExtendedBMP.cpp @@ -183,11 +183,9 @@ HRESULT __cdecl LoadFromBMPEx( hr = LoadFromWICMemory(bmpData.get(), bmpSize, flags, metadata, image); if (FAILED(hr)) - return hr; + { + hr = LoadFromExtendedBMPMemory(bmpData.get(), bmpSize, metadata, image); + } - hr = LoadFromExtendedBMPMemory(bmpData.get(), bmpSize, metadata, image); - if (FAILED(hr)) - return hr; - - return S_OK; + return hr; }