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

windowscodecs: Fix behaviour of format converter for indexed formats when NULL or empty palette has been provided. 

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Dmitry Timoshkov 2019-02-05 11:24:16 +08:00 committed by Alexandre Julliard
parent 603ac6ad21
commit 312cd7b588
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/windowscodecs/converter.c
View File

@ -1278,7 +1278,6 @@ static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WIC
hr = IWICPalette_GetColors(This->palette, 256, colors, &count); hr = IWICPalette_GetColors(This->palette, 256, colors, &count);
if (hr != S_OK) return hr; if (hr != S_OK) return hr;
if (!count) return WINCODEC_ERR_WRONGSTATE;
srcstride = 3 * prc->Width; srcstride = 3 * prc->Width;
srcdatasize = srcstride * prc->Height; srcdatasize = srcstride * prc->Height;
@ -1447,7 +1446,18 @@ static HRESULT WINAPI FormatConverter_CopyPalette(IWICFormatConverter *iface,
TRACE("(%p,%p)\n", iface, palette); TRACE("(%p,%p)\n", iface, palette);
if (!palette) return E_INVALIDARG; if (!palette) return E_INVALIDARG;
if (!This->palette) return WINCODEC_ERR_WRONGSTATE; if (!This->source) return WINCODEC_ERR_WRONGSTATE;
if (!This->palette)
{
HRESULT hr;
UINT bpp;
hr = get_pixelformat_bpp(This->dst_format->guid, &bpp);
if (hr != S_OK) return hr;
if (bpp <= 8) return WINCODEC_ERR_WRONGSTATE;
return IWICBitmapSource_CopyPalette(This->source, palette);
}
return IWICPalette_InitializeFromPalette(palette, This->palette); return IWICPalette_InitializeFromPalette(palette, This->palette);
} }
@ -1478,7 +1488,7 @@ static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface,
pbBuffer, This->src_format->format); pbBuffer, This->src_format->format);
} }
else else
return WINCODEC_ERR_NOTINITIALIZED; return WINCODEC_ERR_WRONGSTATE;
} }
static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface,
@ -1495,6 +1505,10 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface,
if (!palette) if (!palette)
{ {
UINT bpp;
res = get_pixelformat_bpp(dstFormat, &bpp);
if (res != S_OK) return res;
res = PaletteImpl_Create(&palette); res = PaletteImpl_Create(&palette);
if (res != S_OK) return res; if (res != S_OK) return res;
@ -1503,20 +1517,19 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface,
case WICBitmapPaletteTypeCustom: case WICBitmapPaletteTypeCustom:
IWICPalette_Release(palette); IWICPalette_Release(palette);
palette = NULL; palette = NULL;
res = S_OK; if (bpp <= 8) return E_INVALIDARG;
break; break;
case WICBitmapPaletteTypeMedianCut: case WICBitmapPaletteTypeMedianCut:
{ {
UINT bpp; if (bpp <= 8)
res = get_pixelformat_bpp(dstFormat, &bpp);
if (res == S_OK && bpp <= 8)
res = IWICPalette_InitializeFromBitmap(palette, source, 1 << bpp, FALSE); res = IWICPalette_InitializeFromBitmap(palette, source, 1 << bpp, FALSE);
break; break;
} }
default: default:
res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); if (bpp <= 8)
res = IWICPalette_InitializePredefined(palette, palette_type, FALSE);
break; break;
} }
@ -1576,6 +1589,9 @@ end:
LeaveCriticalSection(&This->lock); LeaveCriticalSection(&This->lock);
if (res != S_OK && palette)
IWICPalette_Release(palette);
return res; return res;
} }