Module: wine Branch: master Commit: fcbb2111551ee668e88222721190c75dbe9144c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcbb2111551ee668e882227211...
Author: Evan Stade estade@gmail.com Date: Tue Jul 31 19:16:16 2007 -0700
gdiplus: Added GdipSetImageAttributesColorKeys stub.
---
dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/gdiplus.h | 2 ++ include/gdipluscolormatrix.h | 39 +++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 6 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 68e9c16..e1878e9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -522,7 +522,7 @@ @ stub GdipSetEffectParameters @ stub GdipSetEmpty @ stub GdipSetImageAttributesCachedBackground -@ stub GdipSetImageAttributesColorKeys +@ stdcall GdipSetImageAttributesColorKeys(ptr long long long) @ stub GdipSetImageAttributesColorMatrix @ stub GdipSetImageAttributesGamma @ stub GdipSetImageAttributesNoOp diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 29b8549..bfef8b3 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -48,6 +48,20 @@ GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr) return Ok; }
+GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes *imageattr, + ColorAdjustType type, BOOL enableFlag, ARGB colorLow, ARGB colorHigh) +{ + static int calls; + + if(!imageattr) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr, WrapMode wrap, ARGB argb, BOOL clamp) { diff --git a/include/Makefile.in b/include/Makefile.in index 05dc60e..9fb456a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -164,6 +164,7 @@ SRCDIR_INCLUDES = \ fci.h \ fdi.h \ gdiplus.h \ + gdipluscolormatrix.h \ gdiplusenums.h \ gdiplusflat.h \ gdiplusgpstubs.h \ diff --git a/include/gdiplus.h b/include/gdiplus.h index 1f4ae78..9e72f52 100644 --- a/include/gdiplus.h +++ b/include/gdiplus.h @@ -34,6 +34,7 @@ namespace Gdiplus #include "gdipluspixelformats.h" #include "gdiplusmetaheader.h" #include "gdiplusimaging.h" +#include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h"
namespace DllExports @@ -52,6 +53,7 @@ namespace Gdiplus #include "gdipluspixelformats.h" #include "gdiplusmetaheader.h" #include "gdiplusimaging.h" +#include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h"
#include "gdiplusflat.h" diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h new file mode 100644 index 0000000..893471c --- /dev/null +++ b/include/gdipluscolormatrix.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _GDIPLUSCOLORMATRIX_H +#define _GDIPLUSCOLORMATRIX_H + +enum ColorAdjustType +{ + ColorAdjustTypeDefault, + ColorAdjustTypeBitmap, + ColorAdjustTypeBrush, + ColorAdjustTypePen, + ColorAdjustTypeText, + ColorAdjustTypeCount, + ColorAdjustTypeAny +}; + +#ifndef __cplusplus + +typedef enum ColorAdjustType ColorAdjustType; + +#endif /* end of c typedefs */ + +#endif /* _GDIPLUSCOLORMATRIX_H */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 4f0d88d..e8b067d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -160,6 +160,8 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*,
GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*); +GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes*, + ColorAdjustType,BOOL,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, ARGB,BOOL);