From 6c219878206a7b414e554415bb15f9f48d9d25c5 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Mon, 10 Jan 2011 15:46:44 -0600 Subject: [PATCH 5/5] windowscodecs: Ignore an unspecified extra sample in RGB TIFF images. --- dlls/windowscodecs/tiffformat.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 5c8aae9..976870a 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -333,6 +333,9 @@ 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; @@ -350,6 +353,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; -- 1.7.1