mirror of
https://github.com/microsoft/DirectXTex.git
synced 2025-07-11 04:30:14 +02:00
Fixed problems with WIC1 codepaths
This commit is contained in:
parent
40496ecffa
commit
e3d21fc8c6
@ -219,6 +219,8 @@ HRESULT _ResizeSeparateColorAndAlpha( _In_ IWICImagingFactory* pWIC, _In_ bool i
|
|||||||
colorPixelFormat = GUID_WICPixelFormat96bppRGBFloat;
|
colorPixelFormat = GUID_WICPixelFormat96bppRGBFloat;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#else
|
||||||
|
UNREFERENCED_PARAMETER(iswic2);
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
colorBytesInPixel = 12;
|
colorBytesInPixel = 12;
|
||||||
|
@ -275,7 +275,7 @@ IWICImagingFactory* GetWICFactory(bool& iswic2)
|
|||||||
nullptr,
|
nullptr,
|
||||||
CLSCTX_INPROC_SERVER,
|
CLSCTX_INPROC_SERVER,
|
||||||
__uuidof(IWICImagingFactory),
|
__uuidof(IWICImagingFactory),
|
||||||
(LPVOID*)&s_Factory
|
(LPVOID*)&g_Factory
|
||||||
);
|
);
|
||||||
|
|
||||||
g_WIC2 = false;
|
g_WIC2 = false;
|
||||||
|
@ -161,6 +161,8 @@ static DXGI_FORMAT _DetermineFormat( _In_ const WICPixelFormatGUID& pixelFormat,
|
|||||||
format = DXGI_FORMAT_R32G32B32_FLOAT;
|
format = DXGI_FORMAT_R32G32B32_FLOAT;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#else
|
||||||
|
UNREFERENCED_PARAMETER(iswic2);
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
if ( pConvert )
|
if ( pConvert )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user