windowscodecs: Implement conversion from 16bppGray to 32bppBGRA.
This commit is contained in:
parent
25022fe7d5
commit
363a0fdda9
|
@ -44,6 +44,7 @@ enum pixelformat {
|
|||
format_2bppGray,
|
||||
format_4bppGray,
|
||||
format_8bppGray,
|
||||
format_16bppGray,
|
||||
format_16bppBGR555,
|
||||
format_16bppBGR565,
|
||||
format_24bppBGR,
|
||||
|
@ -380,6 +381,48 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe
|
|||
return res;
|
||||
}
|
||||
return S_OK;
|
||||
case format_16bppGray:
|
||||
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 * 2;
|
||||
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+=2;
|
||||
}
|
||||
srcrow += srcstride;
|
||||
dstrow += cbStride;
|
||||
}
|
||||
}
|
||||
|
||||
HeapFree(GetProcessHeap(), 0, srcdata);
|
||||
|
||||
return res;
|
||||
}
|
||||
return S_OK;
|
||||
case format_16bppBGR555:
|
||||
if (prc)
|
||||
{
|
||||
|
@ -567,6 +610,7 @@ static const struct pixelformatinfo supported_formats[] = {
|
|||
{format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL},
|
||||
{format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL},
|
||||
{format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL},
|
||||
{format_16bppGray, &GUID_WICPixelFormat16bppGray, NULL},
|
||||
{format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL},
|
||||
{format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL},
|
||||
{format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL},
|
||||
|
|
|
@ -925,6 +925,7 @@ static GUID const * const converter_formats[] = {
|
|||
&GUID_WICPixelFormat2bppGray,
|
||||
&GUID_WICPixelFormat4bppGray,
|
||||
&GUID_WICPixelFormat8bppGray,
|
||||
&GUID_WICPixelFormat16bppGray,
|
||||
&GUID_WICPixelFormat16bppBGR555,
|
||||
&GUID_WICPixelFormat16bppBGR565,
|
||||
&GUID_WICPixelFormat24bppBGR,
|
||||
|
|
Loading…
Reference in New Issue