windowscodecs: Implement conversion from CMYK to RGB.

This commit is contained in:
Vincent Povirk 2010-09-11 16:03:12 -05:00 committed by Alexandre Julliard
parent 116cf47df3
commit 9293ad7e13
2 changed files with 24 additions and 0 deletions

View File

@ -52,6 +52,7 @@ enum pixelformat {
format_32bppBGRA, format_32bppBGRA,
format_48bppRGB, format_48bppRGB,
format_64bppRGBA, format_64bppRGBA,
format_32bppCMYK,
}; };
typedef HRESULT (*copyfunc)(struct FormatConverter *This, const WICRect *prc, typedef HRESULT (*copyfunc)(struct FormatConverter *This, const WICRect *prc,
@ -673,6 +674,27 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe
return res; return res;
} }
return S_OK; return S_OK;
case format_32bppCMYK:
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 *pixel = pbBuffer+cbStride*y+4*x;
BYTE c=pixel[0], m=pixel[1], y=pixel[2], k=pixel[3];
pixel[0] = (255-y)*(255-k)/255; /* blue */
pixel[1] = (255-m)*(255-k)/255; /* green */
pixel[2] = (255-c)*(255-k)/255; /* red */
pixel[3] = 255; /* alpha */
}
}
return S_OK;
default: default:
return WINCODEC_ERR_UNSUPPORTEDOPERATION; return WINCODEC_ERR_UNSUPPORTEDOPERATION;
} }
@ -710,6 +732,7 @@ static const struct pixelformatinfo supported_formats[] = {
{format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA},
{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},
{0} {0}
}; };

View File

@ -1231,6 +1231,7 @@ static GUID const * const converter_formats[] = {
&GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppBGRA,
&GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat48bppRGB,
&GUID_WICPixelFormat64bppRGBA, &GUID_WICPixelFormat64bppRGBA,
&GUID_WICPixelFormat32bppCMYK,
NULL NULL
}; };