From 36eaaf57efdbb7a94e6d91d198e69c75a45f7fc4 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 14 Jun 2011 14:30:26 -0500 Subject: [PATCH] windowscodecs: Treat unspecified extra channels as alpha data. --- dlls/windowscodecs/tiffformat.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 1175a77..65de4ff 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -347,12 +347,10 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) else switch(extra_samples[0]) { - case 0: /* Unspecified data */ - decode_info->format = &GUID_WICPixelFormat32bppBGR; - break; case 1: /* Associated (pre-multiplied) alpha data */ decode_info->format = &GUID_WICPixelFormat32bppPBGRA; break; + case 0: /* Unspecified data */ case 2: /* Unassociated alpha data */ decode_info->format = &GUID_WICPixelFormat32bppBGRA; break; @@ -367,13 +365,10 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) else switch(extra_samples[0]) { - case 0: /* Unspecified data */ - /* decode_info->format = &GUID_WICPixelFormat64bppRGB; */ - FIXME("64-bit RGB is unsupported\n"); - return E_FAIL; case 1: /* Associated (pre-multiplied) alpha data */ decode_info->format = &GUID_WICPixelFormat64bppPRGBA; break; + case 0: /* Unspecified data */ case 2: /* Unassociated alpha data */ decode_info->format = &GUID_WICPixelFormat64bppRGBA; break; -- 1.7.1