From d02ca9deb6c6ddbd5a62b760a8f62f14c3614cdb Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Mon, 24 Aug 2009 12:29:02 -0500 Subject: [PATCH] windowscodecs: implement GetPixelFormat for the JPEG decoder --- dlls/windowscodecs/jpegformat.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index c1f9d5e..c9da527 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -399,8 +399,13 @@ static HRESULT WINAPI JpegDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, static HRESULT WINAPI JpegDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + JpegDecoder *This = decoder_from_frame(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); + if (This->cinfo.out_color_space == JCS_RGB) + memcpy(pPixelFormat, &GUID_WICPixelFormat24bppBGR, sizeof(GUID)); + else /* This->cinfo.out_color_space == JCS_GRAYSCALE */ + memcpy(pPixelFormat, &GUID_WICPixelFormat8bppGray, sizeof(GUID)); + return S_OK; } static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, -- 1.5.4.3