From d43dc44e1ec0d8062560e3cfca6e5d715d2dd8f6 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 9 Apr 2008 13:43:16 -0700 Subject: [PATCH 14/22] gdiplus: add a stub for GdipSetImageAttributesRemapTable. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 12 ++++++++++++ include/gdipluscolormatrix.h | 7 +++++++ include/gdiplusgpstubs.h | 1 + include/gdiplustypes.h | 14 ++++++++++++++ 5 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8157f4f..349e10f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -528,7 +528,7 @@ @ stdcall GdipSetImageAttributesNoOp(ptr long long) @ stdcall GdipSetImageAttributesOutputChannel(ptr long long long) @ stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) -@ stub GdipSetImageAttributesRemapTable +@ stdcall GdipSetImageAttributesRemapTable(ptr long long long ptr) @ stub GdipSetImageAttributesThreshold @ stub GdipSetImageAttributesToIdentity @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index b74fc66..f4cecbe 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -146,3 +146,15 @@ GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannelColorProfile(GpImageAttri return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, UINT mapSize, + GDIPCONST ColorMap *map) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h index afc04c0..532e8f4 100644 --- a/include/gdipluscolormatrix.h +++ b/include/gdipluscolormatrix.h @@ -42,11 +42,18 @@ enum ColorAdjustType ColorAdjustTypeAny }; +struct ColorMap +{ + Color oldColor; + Color newCOlor; +}; + #ifndef __cplusplus typedef enum ColorAdjustType ColorAdjustType; typedef enum ColorMatrixFlags ColorMatrixFlags; typedef struct ColorMatrix ColorMatrix; +typedef struct ColorMap ColorMap; #endif /* end of c typedefs */ diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index d7d8702..9f7d092 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -80,5 +80,6 @@ typedef DashStyle GpDashStyle; typedef MatrixOrder GpMatrixOrder; typedef Point GpPoint; typedef WrapMode GpWrapMode; +typedef Color GpColor; #endif diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 29616e9..c944b20 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -19,6 +19,8 @@ #ifndef _GDIPLUSTYPES_H #define _GDIPLUSTYPES_H +#include "gdipluspixelformats.h" + typedef float REAL; enum Status{ @@ -62,6 +64,13 @@ typedef ImageAbort GetThumbnailImageAbort; #ifdef __cplusplus +/* FIXME: missing the methods. */ +class Color +{ +public: + ARGB color; +}; + class Point { public: @@ -201,6 +210,11 @@ public: #else /* end of c++ typedefs */ +typedef struct Color +{ + ARGB color; +} Color; + typedef struct Point { INT X; -- 1.5.3.6