Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-08 13:56:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bugs in WIC loader for multframe images when resizing was required

Browse Source 
- texconv & texassemble now load multi-frames if present from WIC files (tiff, gif)
This commit is contained in:
walbourn_cp
2015-03-17 18:07:21 -07:00
parent 5541a2cbcf
commit f618e9f19d
3 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Texconv/texconv.cpp
View File

@@ -370,6 +370,9 @@ void PrintInfo( const TexMetadata& info )
if ( info.mipLevels > 1 )
wprintf( L",%Iu", info.mipLevels);
if ( info.arraySize > 1 )
wprintf( L",%Iu", info.arraySize);
wprintf( L" ");
PrintFormat( info.format );
@@ -1045,7 +1048,11 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
static_assert( WIC_FLAGS_FILTER_CUBIC == TEX_FILTER_CUBIC, "WIC_FLAGS_* & TEX_FILTER_* should match" );
static_assert( WIC_FLAGS_FILTER_FANT == TEX_FILTER_FANT, "WIC_FLAGS_* & TEX_FILTER_* should match" );
hr = LoadFromWICFile( pConv->szSrc, dwFilter, &info, *image );
DWORD wicFlags = dwFilter;
if (FileType == CODEC_DDS)
wicFlags |= WIC_FLAGS_ALL_FRAMES;
hr = LoadFromWICFile( pConv->szSrc, wicFlags, &info, *image );
if ( FAILED(hr) )
{
wprintf( L" FAILED (%x)\n", hr);