August 2009 - Wine-commits - list.winehq.org

Vincent Povirk : windowscodecs: Implement conversion from 4bppGray to 32bppBGRA.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 25022fe7d5be482790b215bec6978b6e619641fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=25022fe7d5be482790b215bec… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 13:26:23 2009 -0500 windowscodecs: Implement conversion from 4bppGray to 32bppBGRA. --- dlls/windowscodecs/converter.c | 22 +++++++++++++++------- dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 8ec1114..50dcab4 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -42,6 +42,7 @@ enum pixelformat { format_8bppIndexed, format_BlackWhite, format_2bppGray, + format_4bppGray, format_8bppGray, format_16bppBGR555, format_16bppBGR565, @@ -222,6 +223,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe } return S_OK; case format_4bppIndexed: + case format_4bppGray: if (prc) { HRESULT res; @@ -236,16 +238,21 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe IWICPalette *palette; UINT actualcolors; - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; + if (source_format == format_4bppIndexed) + { + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; - res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); + res = IWICBitmapSource_CopyPalette(This->source, palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); - IWICPalette_Release(palette); + IWICPalette_Release(palette); - if (FAILED(res)) return res; + if (FAILED(res)) return res; + } + else + make_grayscale_palette(colors, 16); srcstride = (prc->Width+1)/2; srcdatasize = srcstride * prc->Height; @@ -558,6 +565,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, + {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, {format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 0e857f5..03253b8 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -923,6 +923,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat2bppGray, + &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat16bppBGR565,

1 0

Vincent Povirk : windowscodecs: Implement conversion from 2bppGray to 32bppBGRA.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 4b99c98720f39443d1cb25d2038af8935529ce94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b99c98720f39443d1cb25d20… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 13:23:18 2009 -0500 windowscodecs: Implement conversion from 2bppGray to 32bppBGRA. --- dlls/windowscodecs/converter.c | 32 +++++++++++++++++++++++++------- dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 3ea0b2e..8ec1114 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -41,6 +41,7 @@ enum pixelformat { format_4bppIndexed, format_8bppIndexed, format_BlackWhite, + format_2bppGray, format_8bppGray, format_16bppBGR555, format_16bppBGR565, @@ -68,6 +69,16 @@ typedef struct FormatConverter { WICBitmapPaletteType palette_type; } FormatConverter; +static void make_grayscale_palette(WICColor *colors, UINT num_colors) +{ + int i, v; + for (i=0; i<num_colors; i++) + { + v = i * 255 / (num_colors-1); + colors[i] = 0xff000000 | v<<16 | v<<8 | v; + } +} + static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { @@ -146,6 +157,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe } return S_OK; case format_2bppIndexed: + case format_2bppGray: if (prc) { HRESULT res; @@ -160,16 +172,21 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe IWICPalette *palette; UINT actualcolors; - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; + if (source_format == format_2bppIndexed) + { + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; - res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); + res = IWICBitmapSource_CopyPalette(This->source, palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); - IWICPalette_Release(palette); + IWICPalette_Release(palette); - if (FAILED(res)) return res; + if (FAILED(res)) return res; + } + else + make_grayscale_palette(colors, 4); srcstride = (prc->Width+3)/4; srcdatasize = srcstride * prc->Height; @@ -540,6 +557,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, + {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 4a38849..0e857f5 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -922,6 +922,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat16bppBGR565,

1 0

Vincent Povirk : windowscodecs: Implement conversion from 2bppIndexed to 32bppBGRA.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: b952c5726d6865880446347ce3e703bada8b1e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b952c5726d6865880446347ce… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 13:17:15 2009 -0500 windowscodecs: Implement conversion from 2bppIndexed to 32bppBGRA. --- dlls/windowscodecs/converter.c | 61 ++++++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index af6827c..3ea0b2e 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -37,6 +37,7 @@ struct FormatConverter; enum pixelformat { format_1bppIndexed, + format_2bppIndexed, format_4bppIndexed, format_8bppIndexed, format_BlackWhite, @@ -144,6 +145,65 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe return res; } return S_OK; + case format_2bppIndexed: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcbyte; + BYTE *dstrow; + DWORD *dstpixel; + WICColor colors[4]; + IWICPalette *palette; + UINT actualcolors; + + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + + res = IWICBitmapSource_CopyPalette(This->source, palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); + + IWICPalette_Release(palette); + + if (FAILED(res)) return res; + + srcstride = (prc->Width+3)/4; + 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+=4) { + BYTE srcval; + srcval=*srcbyte++; + *dstpixel++ = colors[srcval>>6]; + if (x+1 < prc->Width) *dstpixel++ = colors[srcval>>4&0x3]; + if (x+2 < prc->Width) *dstpixel++ = colors[srcval>>2&0x3]; + if (x+1 < prc->Width) *dstpixel++ = colors[srcval&0x3]; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; case format_4bppIndexed: if (prc) { @@ -476,6 +536,7 @@ static HRESULT copypixels_to_32bppBGR(struct FormatConverter *This, const WICRec static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, + {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 7218c07..4a38849 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -918,6 +918,7 @@ static struct regsvr_decoder const decoder_list[] = { static GUID const * const converter_formats[] = { &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormatBlackWhite,

1 0

Vincent Povirk : windowscodecs: Implement conversion from BlackWhite to 32bppBGRA.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 3b1fde1668afe5607bbe3f4885a99cce910cc1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b1fde1668afe5607bbe3f488… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 12:46:13 2009 -0500 windowscodecs: Implement conversion from BlackWhite to 32bppBGRA. --- dlls/windowscodecs/converter.c | 25 ++++++++++++++++++------- dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index f8efd45..af6827c 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -39,6 +39,7 @@ enum pixelformat { format_1bppIndexed, format_4bppIndexed, format_8bppIndexed, + format_BlackWhite, format_8bppGray, format_16bppBGR555, format_16bppBGR565, @@ -72,6 +73,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe switch (source_format) { case format_1bppIndexed: + case format_BlackWhite: if (prc) { HRESULT res; @@ -86,16 +88,24 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe IWICPalette *palette; UINT actualcolors; - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; + if (source_format == format_1bppIndexed) + { + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; - res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 2, colors, &actualcolors); + res = IWICBitmapSource_CopyPalette(This->source, palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 2, colors, &actualcolors); - IWICPalette_Release(palette); + IWICPalette_Release(palette); - if (FAILED(res)) return res; + if (FAILED(res)) return res; + } + else + { + colors[0] = 0xff000000; + colors[1] = 0xffffffff; + } srcstride = (prc->Width+7)/8; srcdatasize = srcstride * prc->Height; @@ -468,6 +478,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, + {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 81218b9..7218c07 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -920,6 +920,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, + &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat16bppBGR565,

1 0

Vincent Povirk : windowscodecs: Support color-keyed transparency in PNG images.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 80adebf76cbb5847ce710226a5beff8cc80b9559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80adebf76cbb5847ce710226a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 14:07:35 2009 -0500 windowscodecs: Support color-keyed transparency in PNG images. --- dlls/windowscodecs/pngformat.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index cfc5d2d..be0bd6e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -55,8 +55,11 @@ MAKE_FUNCPTR(png_get_io_ptr); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_read_fn); +MAKE_FUNCPTR(png_set_strip_16); +MAKE_FUNCPTR(png_set_tRNS_to_alpha); MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); @@ -83,8 +86,11 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); LOAD_FUNCPTR(png_set_gray_to_rgb); LOAD_FUNCPTR(png_set_read_fn); + LOAD_FUNCPTR(png_set_strip_16); + LOAD_FUNCPTR(png_set_tRNS_to_alpha); LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); @@ -196,6 +202,10 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p UINT image_size; UINT i; int color_type, bit_depth; + png_bytep trans; + int num_trans; + png_uint_32 transparency; + png_color_16p trans_values; TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); /* initialize libpng */ @@ -242,6 +252,25 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); bit_depth = ppng_get_bit_depth(This->png_ptr, This->info_ptr); + /* check for color-keyed alpha */ + transparency = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); + + if (transparency && color_type != PNG_COLOR_TYPE_PALETTE) + { + /* expand to RGBA */ + if (color_type == PNG_COLOR_TYPE_GRAY) + { + if (bit_depth < 8) + { + ppng_set_gray_1_2_4_to_8(This->png_ptr); + bit_depth = 8; + } + ppng_set_gray_to_rgb(This->png_ptr); + } + ppng_set_tRNS_to_alpha(This->png_ptr); + color_type = PNG_COLOR_TYPE_RGB_ALPHA; + } + switch (color_type) { case PNG_COLOR_TYPE_GRAY:

1 0

Vincent Povirk : windowscodecs: Implement CopyPalette for the PNG decoder.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 4657938235e638b5e43a9d8b93fcad65ec1f34bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4657938235e638b5e43a9d8b9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 13:17:06 2009 -0500 windowscodecs: Implement CopyPalette for the PNG decoder. --- dlls/windowscodecs/pngformat.c | 45 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 5c73f40..cfc5d2d 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -52,6 +52,8 @@ MAKE_FUNCPTR(png_get_color_type); MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_get_PLTE); +MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_read_fn); @@ -78,6 +80,8 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_image_height); LOAD_FUNCPTR(png_get_image_width); LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_get_PLTE); + LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); LOAD_FUNCPTR(png_set_gray_to_rgb); LOAD_FUNCPTR(png_set_read_fn); @@ -484,8 +488,45 @@ static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifac static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + PngDecoder *This = impl_from_frame(iface); + png_uint_32 ret; + png_colorp png_palette; + int num_palette; + WICColor palette[256]; + png_bytep trans; + int num_trans; + png_color_16p trans_values; + int i; + + TRACE("(%p,%p)\n", iface, pIPalette); + + ret = ppng_get_PLTE(This->png_ptr, This->info_ptr, &png_palette, &num_palette); + if (!ret) return WINCODEC_ERR_PALETTEUNAVAILABLE; + + if (num_palette > 256) + { + ERR("palette has %i colors?!\n", num_palette); + return E_FAIL; + } + + for (i=0; i<num_palette; i++) + { + palette[i] = (0xff000000| + png_palette[i].red << 16| + png_palette[i].green << 8| + png_palette[i].blue); + } + + ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); + if (ret) + { + for (i=0; i<num_trans; i++) + { + palette[trans[i]] = 0x00000000; + } + } + + return IWICPalette_InitializeCustom(pIPalette, palette, num_palette); } static HRESULT WINAPI PngDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Implement GetSize for the PNG decoder.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: c7125783dec641086433062d9e24195378a6ddd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7125783dec641086433062d9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 12:39:16 2009 -0500 windowscodecs: Implement GetSize for the PNG decoder. --- dlls/windowscodecs/pngformat.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 5ab9c9f..2373f99 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -456,8 +456,11 @@ static ULONG WINAPI PngDecoder_Frame_Release(IWICBitmapFrameDecode *iface) static HRESULT WINAPI PngDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + PngDecoder *This = impl_from_frame(iface); + *puiWidth = This->width; + *puiHeight = This->height; + TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); + return S_OK; } static HRESULT WINAPI PngDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Implement CopyPixels for the PNG decoder.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: bcd8dc2d5305d810703f1e25a534f6972a1cc044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd8dc2d5305d810703f1e25a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 12:41:03 2009 -0500 windowscodecs: Implement CopyPixels for the PNG decoder. --- dlls/windowscodecs/pngformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 2373f99..5c73f40 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -491,8 +491,12 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, static HRESULT WINAPI PngDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); - return E_NOTIMPL; + PngDecoder *This = impl_from_frame(iface); + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return copy_pixels(This->bpp, This->image_bits, + This->width, This->height, This->stride, + prc, cbStride, cbBufferSize, pbBuffer); } static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Implement GetPixelFormat for the PNG decoder.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 50b07b795d3b9c7f2353d18f87f887a6c5b61038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b07b795d3b9c7f2353d18f8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 18 17:54:15 2009 -0500 windowscodecs: Implement GetPixelFormat for the PNG decoder. --- dlls/windowscodecs/pngformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 4c6c50c..5ab9c9f 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -463,8 +463,12 @@ static HRESULT WINAPI PngDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, static HRESULT WINAPI PngDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p): stub\n", iface, pPixelFormat); - return E_NOTIMPL; + PngDecoder *This = impl_from_frame(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); + + memcpy(pPixelFormat, This->format, sizeof(GUID)); + + return S_OK; } static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Implement GetFrame for the PNG decoder.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: b077f0653c86c0aa21d4b30a5ba75a7e99208a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b077f0653c86c0aa21d4b30a5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 18 17:09:03 2009 -0500 windowscodecs: Implement GetFrame for the PNG decoder. --- dlls/windowscodecs/pngformat.c | 126 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index bd0482b..4c6c50c 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -92,6 +92,7 @@ static void *load_libpng(void) typedef struct { const IWICBitmapDecoderVtbl *lpVtbl; + const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; LONG ref; png_structp png_ptr; png_infop info_ptr; @@ -104,6 +105,13 @@ typedef struct { BYTE *image_bits; } PngDecoder; +static inline PngDecoder *impl_from_frame(IWICBitmapFrameDecode *iface) +{ + return CONTAINING_RECORD(iface, PngDecoder, lpFrameVtbl); +} + +static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl; + static HRESULT WINAPI PngDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { @@ -381,8 +389,18 @@ static HRESULT WINAPI PngDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI PngDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - FIXME("(%p,%u,%p): stub\n", iface, index, ppIBitmapFrame); - return E_NOTIMPL; + PngDecoder *This = (PngDecoder*)iface; + TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); + + if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + + if (index != 0) return E_INVALIDARG; + + IWICBitmapDecoder_AddRef(iface); + + *ppIBitmapFrame = (void*)(&This->lpFrameVtbl); + + return S_OK; } static const IWICBitmapDecoderVtbl PngDecoder_Vtbl = { @@ -402,6 +420,109 @@ static const IWICBitmapDecoderVtbl PngDecoder_Vtbl = { PngDecoder_GetFrame }; +static HRESULT WINAPI PngDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, + void **ppv) +{ + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) + { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PngDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) +{ + PngDecoder *This = impl_from_frame(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI PngDecoder_Frame_Release(IWICBitmapFrameDecode *iface) +{ + PngDecoder *This = impl_from_frame(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI PngDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%p): stub\n", iface, pPixelFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return E_NOTIMPL; +} + +static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl = { + PngDecoder_Frame_QueryInterface, + PngDecoder_Frame_AddRef, + PngDecoder_Frame_Release, + PngDecoder_Frame_GetSize, + PngDecoder_Frame_GetPixelFormat, + PngDecoder_Frame_GetResolution, + PngDecoder_Frame_CopyPalette, + PngDecoder_Frame_CopyPixels, + PngDecoder_Frame_GetMetadataQueryReader, + PngDecoder_Frame_GetColorContexts, + PngDecoder_Frame_GetThumbnail +}; + HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) { PngDecoder *This; @@ -423,6 +544,7 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) if (!This) return E_OUTOFMEMORY; This->lpVtbl = &PngDecoder_Vtbl; + This->lpFrameVtbl = &PngDecoder_FrameVtbl; This->ref = 1; This->png_ptr = NULL; This->info_ptr = NULL;

1 0