Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-04 20:26:14 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Code review feedback

Browse Source
This commit is contained in:
Chuck Walbourn
2016-09-01 16:54:42 -07:00
parent 25dbe0e547
commit 0bbee8c588
5 changed files with 67 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
WICTextureLoader/WICTextureLoader12.cpp
View File

@@ -149,30 +149,25 @@ namespace
IWICImagingFactory2* _GetWIC()
{
static IWICImagingFactory2* s_Factory = nullptr;
static ComPtr<IWICImagingFactory2> s_Factory;
if (s_Factory)
return s_Factory;
if ( s_Factory )
return s_Factory.Get();
static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT;
InitOnceExecuteOnce(&s_initOnce,
[](PINIT_ONCE, PVOID, PVOID *) -> BOOL
(void)InitOnceExecuteOnce(&s_initOnce,
[](PINIT_ONCE, PVOID, PVOID *factory) -> BOOL
{
HRESULT hr = CoCreateInstance(
return SUCCEEDED( CoCreateInstance(
CLSID_WICImagingFactory2,
nullptr,
CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(&s_Factory));
if (FAILED(hr))
{
s_Factory = nullptr;
return FALSE;
}
return TRUE;
}, nullptr, nullptr);
__uuidof(IWICImagingFactory2),
factory) ) ? TRUE : FALSE;
}, nullptr, reinterpret_cast<LPVOID*>(s_Factory.GetAddressOf()));
return s_Factory;
return s_Factory.Get();
}
//---------------------------------------------------------------------------------