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

windowscodecs: Support conversion of 8bppGray to 32bppBGRA.

This commit is contained in:
Vincent Povirk 2009-08-24 13:22:23 -05:00 committed by Alexandre Julliard
parent 341b6ffd71
commit 4753a9d053
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/windowscodecs/converter.c
View File

@ -39,6 +39,7 @@ enum pixelformat {
format_1bppIndexed, format_1bppIndexed,
format_4bppIndexed, format_4bppIndexed,
format_8bppIndexed, format_8bppIndexed,
format_8bppGray,
format_16bppBGR555, format_16bppBGR555,
format_16bppBGR565, format_16bppBGR565,
format_24bppBGR, format_24bppBGR,
@ -190,6 +191,48 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe
return res; return res;
} }
return S_OK; return S_OK;
case format_8bppGray:
if (prc)
{
HRESULT res;
UINT x, y;
BYTE *srcdata;
UINT srcstride, srcdatasize;
const BYTE *srcrow;
const BYTE *srcbyte;
BYTE *dstrow;
DWORD *dstpixel;
srcstride = prc->Width;
srcdatasize = srcstride * prc->Height;
srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize);
if (!srcdata) return E_OUTOFMEMORY;
res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata);
if (SUCCEEDED(res))
{
srcrow = srcdata;
dstrow = pbBuffer;
for (y=0; y<prc->Height; y++) {
srcbyte=(const BYTE*)srcrow;
dstpixel=(DWORD*)dstrow;
for (x=0; x<prc->Width; x++)
{
*dstpixel++ = 0xff000000|(*srcbyte<<16)|(*srcbyte<<8)|*srcbyte;
srcbyte++;
}
srcrow += srcstride;
dstrow += cbStride;
}
}
HeapFree(GetProcessHeap(), 0, srcdata);
return res;
}
return S_OK;
case format_8bppIndexed: case format_8bppIndexed:
if (prc) if (prc)
{ {
@ -425,6 +468,7 @@ static const struct pixelformatinfo supported_formats[] = {
{format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL},
{format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL},
{format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, 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},
{format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL},

1
dlls/windowscodecs/regsvr.c
View File

@ -880,6 +880,7 @@ static GUID const * const converter_formats[] = {
&GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat1bppIndexed,
&GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat4bppIndexed,
&GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat8bppIndexed,
&GUID_WICPixelFormat8bppGray,
&GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat16bppBGR555,
&GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat16bppBGR565,
&GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR,