system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-15 22:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

windowscodecs: Set palette in WriteSource when necessary.

Browse source 
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Vincent Povirk 2020-03-05 13:19:52 -06:00 committed by Alexandre Julliard
parent 9891afcb68
commit 4f53be1a6e
7 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/windowscodecs/bmpencode.c
View file

@ -316,7 +316,8 @@ static HRESULT WINAPI BmpFrameEncode_WriteSource(IWICBitmapFrameEncode *iface,
if (SUCCEEDED(hr))
{
hr = write_source(iface, pIBitmapSource, prc,
This->format->guid, This->format->bpp, This->width, This->height);
This->format->guid, This->format->bpp, !This->colors && This->format->colors,
This->width, This->height);
}
return hr;

3
dlls/windowscodecs/jpegformat.c
View file

@ -1181,7 +1181,8 @@ static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface
if (SUCCEEDED(hr))
{
hr = write_source(iface, pIBitmapSource, prc,
This->format->guid, This->format->bpp, This->width, This->height);
This->format->guid, This->format->bpp, FALSE,
This->width, This->height);
}
return hr;

24
dlls/windowscodecs/main.c
View file

@ -154,7 +154,7 @@ HRESULT configure_write_source(IWICBitmapFrameEncode *iface,
HRESULT write_source(IWICBitmapFrameEncode *iface,
IWICBitmapSource *source, const WICRect *prc,
const WICPixelFormatGUID *format, UINT bpp,
const WICPixelFormatGUID *format, UINT bpp, BOOL need_palette,
INT width, INT height)
{
IWICBitmapSource *converted_source;
@ -185,6 +185,28 @@ HRESULT write_source(IWICBitmapFrameEncode *iface,
return E_NOTIMPL;
}
if (need_palette)
{
IWICPalette *palette;
hr = PaletteImpl_Create(&palette);
if (SUCCEEDED(hr))
{
hr = IWICBitmapSource_CopyPalette(converted_source, palette);
if (SUCCEEDED(hr))
hr = IWICBitmapFrameEncode_SetPalette(iface, palette);
IWICPalette_Release(palette);
}
if (FAILED(hr))
{
IWICBitmapSource_Release(converted_source);
return hr;
}
}
stride = (bpp * width + 7)/8;
pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height);

4
dlls/windowscodecs/pngformat.c
View file

@ -1772,7 +1772,9 @@ static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface,
if (SUCCEEDED(hr))
{
hr = write_source(iface, pIBitmapSource, prc,
This->format->guid, This->format->bpp, This->width, This->height);
This->format->guid, This->format->bpp,
!This->colors && This->format->color_type == PNG_COLOR_TYPE_PALETTE,
This->width, This->height);
}
return hr;

2
dlls/windowscodecs/tests/bmpformat.c
View file

@ -1247,7 +1247,7 @@ static void test_writesource_palette(void)
ok(hr == S_OK, "GetFrame error %#x\n", hr);
hr = IWICBitmapFrameDecode_CopyPalette(frame_decode, palette);
todo_wine ok(hr == S_OK, "CopyPalette error %#x\n", hr);
ok(hr == S_OK, "CopyPalette error %#x\n", hr);
hr = IWICPalette_GetColors(palette, 2, result_palette, &result_colors);
ok(hr == S_OK, "GetColors error %#x\n", hr);

4
dlls/windowscodecs/tiffformat.c
View file

@ -1769,7 +1769,9 @@ static HRESULT WINAPI TiffFrameEncode_WriteSource(IWICBitmapFrameEncode *iface,
if (SUCCEEDED(hr))
{
hr = write_source(iface, pIBitmapSource, prc,
This->format->guid, This->format->bpp, This->width, This->height);
This->format->guid, This->format->bpp,
!This->colors && This->format->bpp <= 8 && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite),
This->width, This->height);
}
return hr;

2
dlls/windowscodecs/wincodecs_private.h
View file

@ -174,7 +174,7 @@ extern HRESULT configure_write_source(IWICBitmapFrameEncode *iface,
extern HRESULT write_source(IWICBitmapFrameEncode *iface,
IWICBitmapSource *source, const WICRect *prc,
const WICPixelFormatGUID *format, UINT bpp,
const WICPixelFormatGUID *format, UINT bpp, BOOL need_palette,
INT width, INT height) DECLSPEC_HIDDEN;
extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) DECLSPEC_HIDDEN;