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

windowscodecs: Add support for converting from 32bppPBGRA.

This commit is contained in:
Vincent Povirk 2011-04-15 02:22:12 -05:00 committed by Alexandre Julliard
parent 80470260d0
commit 10dd670056
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/windowscodecs/converter.c
View File

@ -51,6 +51,7 @@ enum pixelformat {
format_24bppBGR, format_24bppBGR,
format_32bppBGR, format_32bppBGR,
format_32bppBGRA, format_32bppBGRA,
format_32bppPBGRA,
format_48bppRGB, format_48bppRGB,
format_64bppRGBA, format_64bppRGBA,
format_32bppCMYK, format_32bppCMYK,
@ -639,6 +640,28 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe
if (prc) if (prc)
return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer);
return S_OK; return S_OK;
case format_32bppPBGRA:
if (prc)
{
HRESULT res;
UINT x, y;
res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer);
if (FAILED(res)) return res;
for (y=0; y<prc->Height; y++)
for (x=0; x<prc->Width; x++)
{
BYTE alpha = pbBuffer[cbStride*y+4*x+3];
if (alpha != 0 && alpha != 255)
{
pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * 255 / alpha;
pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * 255 / alpha;
pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * 255 / alpha;
}
}
}
return S_OK;
case format_48bppRGB: case format_48bppRGB:
if (prc) if (prc)
{ {
@ -761,6 +784,7 @@ static HRESULT copypixels_to_32bppBGR(struct FormatConverter *This, const WICRec
{ {
case format_32bppBGR: case format_32bppBGR:
case format_32bppBGRA: case format_32bppBGRA:
case format_32bppPBGRA:
if (prc) if (prc)
return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer);
return S_OK; return S_OK;
@ -785,6 +809,7 @@ static const struct pixelformatinfo supported_formats[] = {
{format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL},
{format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR},
{format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA},
{format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, NULL},
{format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL},
{format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL},
{format_32bppCMYK, &GUID_WICPixelFormat32bppCMYK, NULL}, {format_32bppCMYK, &GUID_WICPixelFormat32bppCMYK, NULL},

1
dlls/windowscodecs/regsvr.c
View File

@ -983,6 +983,7 @@ static GUID const * const converter_formats[] = {
&GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR,
&GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGR,
&GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppBGRA,
&GUID_WICPixelFormat32bppPBGRA,
&GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat48bppRGB,
&GUID_WICPixelFormat64bppRGBA, &GUID_WICPixelFormat64bppRGBA,
&GUID_WICPixelFormat32bppCMYK, &GUID_WICPixelFormat32bppCMYK,