Vincent Povirk : windowscodecs: Ignore an unspecified extra sample in RGB TIFF images.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 377d890820f36a1d363e4f857c47a2d8e433755b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=377d890820f36a1d363e4f857c47a2d8e433755b

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Mon Jan 10 15:46:44 2011 -0600

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;