From b73612600f04a7b01b584f83a5918ad16be69125 Mon Sep 17 00:00:00 2001 From: walbourn_cp Date: Fri, 15 Nov 2013 14:54:08 -0800 Subject: [PATCH] DirectXTex: Resize logic in non-WIC custom filtering was backwards for when to use the BOX filter --- DirectXTex/DirectXTexResize.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DirectXTex/DirectXTexResize.cpp b/DirectXTex/DirectXTexResize.cpp index 3588758..1109a49 100644 --- a/DirectXTex/DirectXTexResize.cpp +++ b/DirectXTex/DirectXTexResize.cpp @@ -284,7 +284,7 @@ static HRESULT _ResizeBoxFilter( _In_ const Image& srcImage, _In_ DWORD filter, assert( srcImage.pixels && destImage.pixels ); 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; // Allocate temporary space (3 scanlines) @@ -774,7 +774,7 @@ static HRESULT _PerformResizeUsingCustomFilters( _In_ const Image& srcImage, _In if ( !filter_select ) { // 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; }