[PATCH 2/2] include: Move DWRITE_GLYPH_IMAGE_FORMATS definition to dcommon.h.
Nikolay Sivov
nsivov at codeweavers.com
Wed Oct 2 08:12:51 CDT 2019
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
include/dcommon.idl | 13 +++++++++++++
include/dwrite_3.idl | 13 -------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/dcommon.idl b/include/dcommon.idl
index 88f97c56a4..53281bd487 100644
--- a/include/dcommon.idl
+++ b/include/dcommon.idl
@@ -33,6 +33,19 @@ typedef enum DWRITE_MEASURING_MODE
DWRITE_MEASURING_MODE_GDI_NATURAL
} DWRITE_MEASURING_MODE;
+typedef enum DWRITE_GLYPH_IMAGE_FORMATS
+{
+ DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0,
+ DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 1 << 0,
+ DWRITE_GLYPH_IMAGE_FORMATS_CFF = 1 << 1,
+ DWRITE_GLYPH_IMAGE_FORMATS_COLR = 1 << 2,
+ DWRITE_GLYPH_IMAGE_FORMATS_SVG = 1 << 3,
+ DWRITE_GLYPH_IMAGE_FORMATS_PNG = 1 << 4,
+ DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 1 << 5,
+ DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 1 << 6,
+ DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7
+} DWRITE_GLYPH_IMAGE_FORMATS;
+
typedef enum D2D1_ALPHA_MODE
{
D2D1_ALPHA_MODE_UNKNOWN = 0,
diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl
index dc8bf0e959..b148bd725b 100644
--- a/include/dwrite_3.idl
+++ b/include/dwrite_3.idl
@@ -733,19 +733,6 @@ interface IDWriteFactory3 : IDWriteFactory2
HRESULT GetFontDownloadQueue(IDWriteFontDownloadQueue **queue);
}
-typedef enum DWRITE_GLYPH_IMAGE_FORMATS
-{
- DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0,
- DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 1 << 0,
- DWRITE_GLYPH_IMAGE_FORMATS_CFF = 1 << 1,
- DWRITE_GLYPH_IMAGE_FORMATS_COLR = 1 << 2,
- DWRITE_GLYPH_IMAGE_FORMATS_SVG = 1 << 3,
- DWRITE_GLYPH_IMAGE_FORMATS_PNG = 1 << 4,
- DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 1 << 5,
- DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 1 << 6,
- DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7
-} DWRITE_GLYPH_IMAGE_FORMATS;
-
typedef struct DWRITE_GLYPH_IMAGE_DATA
{
void const *imageData;
--
2.23.0
More information about the wine-devel
mailing list