[Mingw-w64-public] [PATCH 2/4] dcommon.h: Moved more declarations to dcommon.h.

[Jacek Caban]

Signed-off-by: Jacek Caban <ja...@codeweavers.com>
---
 mingw-w64-headers/include/d2d1_1.h       |  1 -
 mingw-w64-headers/include/d2dbasetypes.h |  9 ---------
 mingw-w64-headers/include/dcommon.h      | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 10 deletions(-)



diff --git a/mingw-w64-headers/include/d2d1_1.h b/mingw-w64-headers/include/d2d1_1.h
index 3e504c2d..de2cb091 100644
--- a/mingw-w64-headers/include/d2d1_1.h
+++ b/mingw-w64-headers/include/d2d1_1.h
@@ -36,7 +36,6 @@ typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION;
 typedef HRESULT (CALLBACK *PD2D1_EFFECT_FACTORY)(IUnknown**);
 
 typedef D2D_RECT_L D2D1_RECT_L;
-typedef D2D_POINT_2L D2D1_POINT_2L;
 
 typedef enum D2D1_PROPERTY_TYPE {
     D2D1_PROPERTY_TYPE_UNKNOWN       = 0,
diff --git a/mingw-w64-headers/include/d2dbasetypes.h b/mingw-w64-headers/include/d2dbasetypes.h
index 60dc45fe..387d1932 100644
--- a/mingw-w64-headers/include/d2dbasetypes.h
+++ b/mingw-w64-headers/include/d2dbasetypes.h
@@ -67,8 +67,6 @@ struct D2D_POINT_2F {
   FLOAT y;
 };
 
-typedef POINT D2D_POINT_2L;
-
 struct D2D_POINT_2U {
   UINT32 x;
   UINT32 y;
@@ -95,11 +93,6 @@ struct D2D_SIZE_F {
   FLOAT height;
 };
 
-struct D2D_SIZE_U {
-  UINT32 width;
-  UINT32 height;
-};
-
 typedef D2D_COLOR_F D2D1_COLOR_F;
 
 typedef struct D2D_POINT_2F D2D1_POINT_2F;
@@ -112,8 +105,6 @@ typedef struct D2D_RECT_U D2D1_RECT_U;
 
 typedef struct D2D_SIZE_F D2D1_SIZE_F;
 
-typedef struct D2D_SIZE_U D2D1_SIZE_U;
-
 typedef struct D2D_VECTOR_2F {
     FLOAT x;
     FLOAT y;
diff --git a/mingw-w64-headers/include/dcommon.h b/mingw-w64-headers/include/dcommon.h
index 86fabcc6..31be588b 100644
--- a/mingw-w64-headers/include/dcommon.h
+++ b/mingw-w64-headers/include/dcommon.h
@@ -12,4 +12,26 @@ typedef enum DWRITE_MEASURING_MODE {
   DWRITE_MEASURING_MODE_GDI_NATURAL 
 } DWRITE_MEASURING_MODE;
 
+enum DWRITE_GLYPH_IMAGE_FORMATS {
+    DWRITE_GLYPH_IMAGE_FORMATS_NONE      = 0x0000,
+    DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE  = 0x0001,
+    DWRITE_GLYPH_IMAGE_FORMATS_CFF       = 0x0002,
+    DWRITE_GLYPH_IMAGE_FORMATS_COLR      = 0x0004,
+    DWRITE_GLYPH_IMAGE_FORMATS_SVG       = 0x0008,
+    DWRITE_GLYPH_IMAGE_FORMATS_PNG       = 0x0010,
+    DWRITE_GLYPH_IMAGE_FORMATS_JPEG      = 0x0020,
+    DWRITE_GLYPH_IMAGE_FORMATS_TIFF      = 0x0040,
+    DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 0x0080,
+};
+
+typedef POINT D2D_POINT_2L;
+typedef D2D_POINT_2L D2D1_POINT_2L;
+
+struct D2D_SIZE_U {
+  UINT32 width;
+  UINT32 height;
+};
+
+typedef struct D2D_SIZE_U D2D1_SIZE_U;
+
 #endif /*#define __INC_DCOMMON__*/


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public