Vincent Povirk : windowscodecs: Treat samples as unspecified if there' s no ExtraSamples tag.

[Alexandre Julliard]

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

Author: Vincent Povirk 
Date:   Mon Apr 25 04:02:48 2011 -0500

windowscodecs: Treat samples as unspecified if there's no ExtraSamples tag.

---

dlls/windowscodecs/tiffformat.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c
index 88dbc79..1175a77 100644
--- a/dlls/windowscodecs/tiffformat.c
+++ b/dlls/windowscodecs/tiffformat.c
@@ -254,7 +254,7 @@ static inline TiffFrameDecode *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDe
 static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
 {
     uint16 photometric, bps, samples, planar;
-    uint16 extra_sample_count, *extra_samples;
+    uint16 extra_sample_count, extra_sample, *extra_samples;
     int ret;

decode_info->indexed = 0;
@@ -327,8 +327,9 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
             ret = pTIFFGetField(tiff, TIFFTAG_EXTRASAMPLES, &extra_sample_count, &extra_samples);
             if (!ret)
             {
-                WARN("Cannot get extra sample type for RGB data, ret=%i count=%i\n", ret, extra_sample_count);
-                return E_FAIL;
+                extra_sample_count = 1;
+                extra_sample = 0;
+                extra_samples = &extra_sample;
             }
         }
         else if (samples != 3)