From 547e6add7bbcf795877b82a79143539904d6a9f1 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Fri, 11 Dec 2009 16:51:46 -0600 Subject: [PATCH 2/6] gdiplus: Implement GdipSetImagePalette. --- dlls/gdiplus/gdiplus_private.h | 4 ++++ dlls/gdiplus/graphics.c | 4 ++++ dlls/gdiplus/image.c | 32 +++++++++++++++++++++++++++----- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index dfff66c..0ceeb6e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -213,6 +213,10 @@ struct GpImage{ ImageType type; GUID format; UINT flags; + UINT palette_flags; + UINT palette_count; + UINT palette_size; + ARGB *palette_entries; }; struct GpMetafile{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index df107e4..80ef463 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1256,6 +1256,10 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, (*metafile)->image.type = ImageTypeMetafile; memcpy(&(*metafile)->image.format, &ImageFormatWMF, sizeof(GUID)); + (*metafile)->image.palette_flags = 0; + (*metafile)->image.palette_count = 0; + (*metafile)->image.palette_size = 0; + (*metafile)->image.palette_entries = NULL; (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Right) / ((REAL) placeable->Inch); (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 73a6bd6..340f2e6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1201,6 +1201,10 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->image.type = ImageTypeBitmap; memcpy(&(*bitmap)->image.format, &ImageFormatMemoryBMP, sizeof(GUID)); (*bitmap)->image.flags = ImageFlagsNone; + (*bitmap)->image.palette_flags = 0; + (*bitmap)->image.palette_count = 0; + (*bitmap)->image.palette_size = 0; + (*bitmap)->image.palette_entries = NULL; (*bitmap)->width = width; (*bitmap)->height = height; (*bitmap)->format = format; @@ -1318,6 +1322,7 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) GdipFree(((GpBitmap*)image)->bitmapbits); DeleteDC(((GpBitmap*)image)->hdc); } + GdipFree(image->palette_entries); GdipFree(image); return Ok; @@ -1891,6 +1896,10 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid (*image)->type = ImageTypeMetafile; (*image)->picture = pic; (*image)->flags = ImageFlagsNone; + (*image)->palette_flags = 0; + (*image)->palette_count = 0; + (*image)->palette_size = 0; + (*image)->palette_entries = NULL; return Ok; } @@ -2243,15 +2252,28 @@ GpStatus WINGDIPAPI GdipGetImagePalette(GpImage *image, ColorPalette *palette, I GpStatus WINGDIPAPI GdipSetImagePalette(GpImage *image, GDIPCONST ColorPalette *palette) { - static int calls; + TRACE("(%p,%p)\n", image, palette); - if(!image || !palette) + if(!image || !palette || palette->Count > 256) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (palette->Count > image->palette_size) + { + ARGB *new_palette; - return NotImplemented; + new_palette = GdipAlloc(sizeof(ARGB) * palette->Count); + if (!new_palette) return OutOfMemory; + + GdipFree(image->palette_entries); + image->palette_entries = new_palette; + image->palette_size = palette->Count; + } + + image->palette_flags = palette->Flags; + image->palette_count = palette->Count; + memcpy(image->palette_entries, palette->Entries, sizeof(ARGB)*palette->Count); + + return Ok; } /************************************************************************* -- 1.6.3.3