[PATCH 2/4] d3dx9: Fix miplevels handling for DDS file format.

Józef Kucia jkucia at codeweavers.com
Sun Aug 16 15:27:59 CDT 2015


---
 dlls/d3dx9_36/surface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 6150575..b78df6f 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -390,7 +390,7 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG
     info->Width = header->width;
     info->Height = header->height;
     info->Depth = 1;
-    info->MipLevels = (header->flags & DDS_MIPMAPCOUNT) ?  header->miplevels : 1;
+    info->MipLevels = (header->flags & DDS_MIPMAPCOUNT) && header->miplevels ? header->miplevels : 1;
 
     info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format);
     if (info->Format == D3DFMT_UNKNOWN)
-- 
2.4.6




More information about the wine-patches mailing list