From c820139b0f8f3099cffbdd39e5bac6cf642f018e Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Wed, 21 Oct 2015 22:07:02 +0300
Subject: [PATCH] gdiplus: Added GdipBitmapConvertFormat stub.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/gdiplus/gdiplus.spec     |  2 +-
 dlls/gdiplus/image.c          | 10 ++++++++++
 include/gdipluspixelformats.h | 29 +++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index edf4e451364..9f7ce5fe584 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -620,7 +620,7 @@
 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr)
 621 stub GdipBitmapGetHistogram
 622 stub GdipBitmapGetHistogramSize
-623 stub GdipBitmapConvertFormat
+623 stdcall GdipBitmapConvertFormat(ptr long long long ptr float)
 624 stdcall GdipImageSetAbort(ptr ptr)
 625 stub GdipGraphicsSetAbort
 626 stub GdipDrawImageFX
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 0a8027ab9b2..6725de8c39d 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -5268,3 +5268,13 @@ GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort)
     FIXME("(%p, %p): stub\n", image, pabort);
     return NotImplemented;
 }
+
+/*****************************************************************************
+ * GdipBitmapConvertFormat [GDIPLUS.@]
+ */
+GpStatus WINGDIPAPI GdipBitmapConvertFormat(GpBitmap *bitmap, PixelFormat format, DitherType dithertype,
+    PaletteType palettetype, ColorPalette *palette, REAL alphathreshold)
+{
+    FIXME("(%p, 0x%08x, %d, %d, %p, %f): stub\n", bitmap, format, dithertype, palettetype, palette, alphathreshold);
+    return NotImplemented;
+}
diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h
index 9922b246613..2a2a3ccbcfd 100644
--- a/include/gdipluspixelformats.h
+++ b/include/gdipluspixelformats.h
@@ -102,4 +102,33 @@ typedef struct ColorPalette
 
 #endif  /* end of c typedefs */
 
+typedef enum DitherType
+{
+    DitherTypeNone,
+    DitherTypeSolid,
+    DitherTypeOrdered4x4,
+    DitherTypeOrdered8x8,
+    DitherTypeOrdered16x16,
+    DitherTypeSpiral4x4,
+    DitherTypeSpiral8x8,
+    DitherTypeDualSpiral4x4,
+    DitherTypeDualSpiral8x8,
+    DitherTypeErrorDiffusion,
+    DitherTypeMax
+} DitherType;
+
+typedef enum PaletteType
+{
+    PaletteTypeCustom,
+    PaletteTypeOptimal,
+    PaletteTypeFixedBW,
+    PaletteTypeFixedHalftone8,
+    PaletteTypeFixedHalftone27,
+    PaletteTypeFixedHalftone64,
+    PaletteTypeFixedHalftone125,
+    PaletteTypeFixedHalftone216,
+    PaletteTypeFixedHalftone252,
+    PaletteTypeFixedHalftone256
+} PaletteType;
+
 #endif