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

Fixed problems with WIC1 codepaths

Browse Source
This commit is contained in:
Chuck Walbourn 2015-08-19 18:00:26 -07:00
parent 40496ecffa
commit e3d21fc8c6
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DirectXTex/DirectXTexMipmaps.cpp
View File

@ -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;

2
DirectXTex/DirectXTexUtil.cpp
View File

@ -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;

2
DirectXTex/DirectXTexWIC.cpp
View File

@ -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 )