commit 1c3e32a79d25bf62cb6d7a80c1a80388daa3b400
author Biswapriyo Nath <nathbappai@gmail.com> Sun Apr 26 02:17:16 2020 +0530
committer Liu Hao <lh_mouse@126.com> Sun Apr 26 23:43:38 2020 +0800
tree b5e44920090faa63904532d61fd76f0abf77d8aa
parent 223de3ab824a8b57771b8e66ca84fb31361a2f20

headers: move symbols from d2d1 to dcommon for wincodec

Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com>
Signed-off-by: Liu Hao <lh_mouse@126.com>

mingw-w64-headers/include/d2d1.h

diff --git a/mingw-w64-headers/include/d2d1.h b/mingw-w64-headers/include/d2d1.h
index ce67101..8368cf4 100644
--- a/mingw-w64-headers/include/d2d1.h
+++ b/mingw-w64-headers/include/d2d1.h
@@ -69,14 +69,6 @@
 typedef struct IDWriteFontFace IDWriteFontFace;
 #endif
 
-typedef enum D2D1_ALPHA_MODE {
-  D2D1_ALPHA_MODE_UNKNOWN         = 0,
-  D2D1_ALPHA_MODE_PREMULTIPLIED   = 1,
-  D2D1_ALPHA_MODE_STRAIGHT        = 2,
-  D2D1_ALPHA_MODE_IGNORE          = 3,
-  D2D1_ALPHA_MODE_FORCE_DWORD     = 0xffffffff
-} D2D1_ALPHA_MODE;
-
 typedef enum D2D1_ANTIALIAS_MODE {
   D2D1_ANTIALIAS_MODE_PER_PRIMITIVE   = 0,
   D2D1_ANTIALIAS_MODE_ALIASED         = 1,
@@ -342,7 +334,6 @@
 typedef struct D2D1_HWND_RENDER_TARGET_PROPERTIES D2D1_HWND_RENDER_TARGET_PROPERTIES;
 typedef struct D2D1_LAYER_PARAMETERS D2D1_LAYER_PARAMETERS;
 typedef struct D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES;
-typedef struct D2D1_PIXEL_FORMAT D2D1_PIXEL_FORMAT;
 typedef struct D2D1_QUADRATIC_BEZIER_SEGMENT D2D1_QUADRATIC_BEZIER_SEGMENT;
 typedef struct D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES;
 typedef struct D2D1_RENDER_TARGET_PROPERTIES D2D1_RENDER_TARGET_PROPERTIES;
@@ -370,11 +361,6 @@
   D2D1_BITMAP_INTERPOLATION_MODE interpolationMode;
 };
 
-struct D2D1_PIXEL_FORMAT {
-  DXGI_FORMAT     format;
-  D2D1_ALPHA_MODE alphaMode;
-};
-
 struct D2D1_BITMAP_PROPERTIES {
   D2D1_PIXEL_FORMAT pixelFormat;
   FLOAT             dpiX;

mingw-w64-headers/include/dcommon.h

diff --git a/mingw-w64-headers/include/dcommon.h b/mingw-w64-headers/include/dcommon.h
index 31be588..7babc82 100644
--- a/mingw-w64-headers/include/dcommon.h
+++ b/mingw-w64-headers/include/dcommon.h
@@ -6,6 +6,8 @@
 #ifndef __INC_DCOMMON__
 #define __INC_DCOMMON__
 
+#include <dxgiformat.h>
+
 typedef enum DWRITE_MEASURING_MODE {
   DWRITE_MEASURING_MODE_NATURAL = 0,
   DWRITE_MEASURING_MODE_GDI_CLASSIC,
@@ -24,6 +26,19 @@
     DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 0x0080,
 };
 
+typedef enum D2D1_ALPHA_MODE {
+  D2D1_ALPHA_MODE_UNKNOWN = 0,
+  D2D1_ALPHA_MODE_PREMULTIPLIED = 1,
+  D2D1_ALPHA_MODE_STRAIGHT = 2,
+  D2D1_ALPHA_MODE_IGNORE = 3,
+  D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff
+} D2D1_ALPHA_MODE;
+
+typedef struct D2D1_PIXEL_FORMAT {
+  DXGI_FORMAT format;
+  D2D1_ALPHA_MODE alphaMode;
+} D2D1_PIXEL_FORMAT;
+
 typedef POINT D2D_POINT_2L;
 typedef D2D_POINT_2L D2D1_POINT_2L;