ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Vincent Povirk 2011-04-25 04:02:48 -05:00 committed by Alexandre Julliard
parent cad8afb8ee
commit 9483b3ba86
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/windowscodecs/tiffformat.c
View File

@ -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)