DirectXTex: Resize logic in non-WIC custom filtering was backwards for when to use the BOX filter

This commit is contained in:
walbourn_cp 2013-11-15 14:54:08 -08:00
parent c7d32a482a
commit b73612600f

View File

@ -284,7 +284,7 @@ static HRESULT _ResizeBoxFilter( _In_ const Image& srcImage, _In_ DWORD filter,
assert( srcImage.pixels && destImage.pixels ); assert( srcImage.pixels && destImage.pixels );
assert( srcImage.format == destImage.format ); assert( srcImage.format == destImage.format );
if ( ( (srcImage.width << 1) != destImage.width ) || ( (srcImage.height << 1) != destImage.height ) ) if ( ( (destImage.width << 1) != srcImage.width ) || ( (destImage.height << 1) != srcImage.height ) )
return E_FAIL; return E_FAIL;
// Allocate temporary space (3 scanlines) // Allocate temporary space (3 scanlines)
@ -774,7 +774,7 @@ static HRESULT _PerformResizeUsingCustomFilters( _In_ const Image& srcImage, _In
if ( !filter_select ) if ( !filter_select )
{ {
// Default filter choice // Default filter choice
filter_select = ( ( (srcImage.width << 1) == destImage.width ) && ( (srcImage.height << 1) == destImage.height ) ) filter_select = ( ( (destImage.width << 1) == srcImage.width ) && ( (destImage.height << 1) == srcImage.height ) )
? TEX_FILTER_BOX : TEX_FILTER_LINEAR; ? TEX_FILTER_BOX : TEX_FILTER_LINEAR;
} }