Skip to content

W
wine-cw
Commit 785f84a6 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard
Browse files
Options

windowscodecs: Treat unspecified extra channels as alpha data.

parent 8153674c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
dlls/windowscodecs/tiffformat.c
View file @ 785f84a6
...@@ -347,12 +347,10 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) ...@@ -347,12 +347,10 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
else else
switch(extra_samples[0]) switch(extra_samples[0])
{ {
case 0: /* Unspecified data */
decode_info->format = &GUID_WICPixelFormat32bppBGR;
break;
case 1: /* Associated (pre-multiplied) alpha data */ case 1: /* Associated (pre-multiplied) alpha data */
decode_info->format = &GUID_WICPixelFormat32bppPBGRA; decode_info->format = &GUID_WICPixelFormat32bppPBGRA;
break; break;
case 0: /* Unspecified data */
case 2: /* Unassociated alpha data */ case 2: /* Unassociated alpha data */
decode_info->format = &GUID_WICPixelFormat32bppBGRA; decode_info->format = &GUID_WICPixelFormat32bppBGRA;
break; break;
...@@ -367,13 +365,10 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) ...@@ -367,13 +365,10 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
else else
switch(extra_samples[0]) 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 */ case 1: /* Associated (pre-multiplied) alpha data */
decode_info->format = &GUID_WICPixelFormat64bppPRGBA; decode_info->format = &GUID_WICPixelFormat64bppPRGBA;
break; break;
case 0: /* Unspecified data */
case 2: /* Unassociated alpha data */ case 2: /* Unassociated alpha data */
decode_info->format = &GUID_WICPixelFormat64bppRGBA; decode_info->format = &GUID_WICPixelFormat64bppRGBA;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment