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

windowscodecs: Implement conversion from 4bppGray to 32bppBGRA.

This commit is contained in:
Vincent Povirk 2009-08-27 13:26:23 -05:00 committed by Alexandre Julliard
parent 4b99c98720
commit 25022fe7d5
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/windowscodecs/converter.c
View File

@ -42,6 +42,7 @@ enum pixelformat {
format_8bppIndexed, format_8bppIndexed,
format_BlackWhite, format_BlackWhite,
format_2bppGray, format_2bppGray,
format_4bppGray,
format_8bppGray, format_8bppGray,
format_16bppBGR555, format_16bppBGR555,
format_16bppBGR565, format_16bppBGR565,
@ -222,6 +223,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe
} }
return S_OK; return S_OK;
case format_4bppIndexed: case format_4bppIndexed:
case format_4bppGray:
if (prc) if (prc)
{ {
HRESULT res; HRESULT res;
@ -236,16 +238,21 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe
IWICPalette *palette; IWICPalette *palette;
UINT actualcolors; UINT actualcolors;
res = PaletteImpl_Create(&palette); if (source_format == format_4bppIndexed)
if (FAILED(res)) return res; {
res = PaletteImpl_Create(&palette);
if (FAILED(res)) return res;
res = IWICBitmapSource_CopyPalette(This->source, palette); res = IWICBitmapSource_CopyPalette(This->source, palette);
if (SUCCEEDED(res)) if (SUCCEEDED(res))
res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); res = IWICPalette_GetColors(palette, 16, colors, &actualcolors);
IWICPalette_Release(palette); IWICPalette_Release(palette);
if (FAILED(res)) return res; if (FAILED(res)) return res;
}
else
make_grayscale_palette(colors, 16);
srcstride = (prc->Width+1)/2; srcstride = (prc->Width+1)/2;
srcdatasize = srcstride * prc->Height; srcdatasize = srcstride * prc->Height;
@ -558,6 +565,7 @@ static const struct pixelformatinfo supported_formats[] = {
{format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL},
{format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL},
{format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL},
{format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL},
{format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL}, {format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL},
{format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL},
{format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL},

1
dlls/windowscodecs/regsvr.c
View File

@ -923,6 +923,7 @@ static GUID const * const converter_formats[] = {
&GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat8bppIndexed,
&GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormatBlackWhite,
&GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppGray,
&GUID_WICPixelFormat4bppGray,
&GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppGray,
&GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat16bppBGR555,
&GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat16bppBGR565,