ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Implement GdipSetImageAttributesRemapTable with updated test.

This commit is contained in:
Justin Chevrier 2010-03-03 20:06:33 -05:00 committed by Alexandre Julliard
parent 74a3945b00
commit 78f9177d9d
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/gdiplus/gdiplus_private.h
View File

@ -264,10 +264,17 @@ struct color_matrix{
ColorMatrix graymatrix; ColorMatrix graymatrix;
}; };
struct color_remap_table{
BOOL enabled;
INT mapsize;
GDIPCONST ColorMap *colormap;
};
struct GpImageAttributes{ struct GpImageAttributes{
WrapMode wrap; WrapMode wrap;
struct color_key colorkeys[ColorAdjustTypeCount]; struct color_key colorkeys[ColorAdjustTypeCount];
struct color_matrix colormatrices[ColorAdjustTypeCount]; struct color_matrix colormatrices[ColorAdjustTypeCount];
struct color_remap_table colorremaptables[ColorAdjustTypeCount];
BOOL gamma_enabled[ColorAdjustTypeCount]; BOOL gamma_enabled[ColorAdjustTypeCount];
REAL gamma[ColorAdjustTypeCount]; REAL gamma[ColorAdjustTypeCount];
}; };

19
dlls/gdiplus/imageattributes.c
View File

@ -204,14 +204,23 @@ GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAtt
ColorAdjustType type, BOOL enableFlag, UINT mapSize, ColorAdjustType type, BOOL enableFlag, UINT mapSize,
GDIPCONST ColorMap *map) GDIPCONST ColorMap *map)
{ {
static int calls;
TRACE("(%p,%u,%i,%u,%p)\n", imageAttr, type, enableFlag, mapSize, map); TRACE("(%p,%u,%i,%u,%p)\n", imageAttr, type, enableFlag, mapSize, map);
if(!(calls++)) if(!imageAttr || type >= ColorAdjustTypeCount)
FIXME("not implemented\n"); return InvalidParameter;
return NotImplemented; if (enableFlag)
{
if(!map || !mapSize)
return InvalidParameter;
imageAttr->colorremaptables[type].mapsize = mapSize;
imageAttr->colorremaptables[type].colormap = map;
}
imageAttr->colorremaptables[type].enabled = enableFlag;
return Ok;
} }
GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes *imageAttr, GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes *imageAttr,

14
dlls/gdiplus/tests/image.c
View File

@ -1760,28 +1760,28 @@ static void test_remaptable(void)
map->newColor.Argb = 0xffff00ff; map->newColor.Argb = 0xffff00ff;
stat = GdipSetImageAttributesRemapTable(NULL, ColorAdjustTypeDefault, TRUE, 1, map); stat = GdipSetImageAttributesRemapTable(NULL, ColorAdjustTypeDefault, TRUE, 1, map);
todo_wine expect(InvalidParameter, stat); expect(InvalidParameter, stat);
stat = GdipCreateImageAttributes(&imageattr); stat = GdipCreateImageAttributes(&imageattr);
expect(Ok, stat); expect(Ok, stat);
stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 1, NULL); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 1, NULL);
todo_wine expect(InvalidParameter, stat); expect(InvalidParameter, stat);
stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeCount, TRUE, 1, map); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeCount, TRUE, 1, map);
todo_wine expect(InvalidParameter, stat); expect(InvalidParameter, stat);
stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeAny, TRUE, 1, map); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeAny, TRUE, 1, map);
todo_wine expect(InvalidParameter, stat); expect(InvalidParameter, stat);
stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 0, map); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 0, map);
todo_wine expect(InvalidParameter, stat); expect(InvalidParameter, stat);
stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, FALSE, 0, NULL); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, FALSE, 0, NULL);
todo_wine expect(Ok, stat); expect(Ok, stat);
stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 1, map); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 1, map);
todo_wine expect(Ok, stat); expect(Ok, stat);
stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1);
expect(Ok, stat); expect(Ok, stat);