diff options
| author | wm4 <wm4@nowhere> | 2015-08-05 22:05:36 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-08-05 22:05:36 +0200 |
| commit | cb1e749aa9ac421629cf8d443b7aac7dfdd2fe72 (patch) | |
| tree | a89769f8d3abfd26c0e3f75f849cd02043090b98 /libass | |
| parent | baa5823cb56d86512a38fe8354fee1ca07627c9f (diff) | |
| download | libass-cb1e749aa9ac421629cf8d443b7aac7dfdd2fe72.tar.bz2 libass-cb1e749aa9ac421629cf8d443b7aac7dfdd2fe72.tar.xz | |
Rename dwrite.h, minor cleanups
Rename dwrite.h to dwrite_c.h to make the difference between the
official header and ours clearer. Also apply minor cleanups to it.
Remove the patch against upstream MinGW; it's pointless now.
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/Makefile.am | 2 | ||||
| -rw-r--r-- | libass/ass_directwrite.c | 6 | ||||
| -rw-r--r-- | libass/dwrite_c.h (renamed from libass/dwrite.h) | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/libass/Makefile.am b/libass/Makefile.am index 2d7bc44..b6965c9 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -19,7 +19,7 @@ SRC_INTEL_RASTERIZER = x86/rasterizer.asm SRC_RASTERIZER = ass_rasterizer.h ass_rasterizer.c ass_rasterizer_c.c -SRC_DIRECTWRITE = ass_directwrite.c ass_directwrite.h dwrite.h +SRC_DIRECTWRITE = ass_directwrite.c ass_directwrite.h dwrite_c.h lib_LTLIBRARIES = libass.la libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontselect.c ass_render.c \ diff --git a/libass/ass_directwrite.c b/libass/ass_directwrite.c index 0ce1478..fb21d5c 100644 --- a/libass/ass_directwrite.c +++ b/libass/ass_directwrite.c @@ -23,11 +23,7 @@ #include <ole2.h> #include <shobjidl.h> -#include "dwrite.h" - -DEFINE_GUID(IID_IDWriteFactory, 0xb859ee5a,0xd838,0x4b5b,0xa2,0xe8,0x1a,0xdc,0x7d,0x93,0xdb,0x48); -DEFINE_GUID(IID_IDWritePixelSnapping, 0xeaf3a2da,0xecf4,0x4d24,0xb6,0x44,0xb3,0x4f,0x68,0x42,0x02,0x4b); -DEFINE_GUID(IID_IDWriteTextRenderer, 0xef8a8135,0x5cc6,0x45fe,0x88,0x25,0xc5,0xa0,0x72,0x4e,0xb8,0x19); +#include "dwrite_c.h" #include "ass_directwrite.h" #include "ass_utils.h" diff --git a/libass/dwrite.h b/libass/dwrite_c.h index c7bda0b..c692c9d 100644 --- a/libass/dwrite.h +++ b/libass/dwrite_c.h @@ -4,7 +4,8 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ /** - * Stripped version. Only definitions needed by libass. + * Stripped version. Only definitions needed by libass. Contains fixes to + * make it compile with C. Also needed on MSVC. */ #ifndef __INC_DWRITE__ #define __INC_DWRITE__ @@ -665,4 +666,8 @@ DECLARE_INTERFACE_(IDWriteTextRenderer,IDWritePixelSnapping) END_INTERFACE }; +DEFINE_GUID(IID_IDWriteFactory, 0xb859ee5a,0xd838,0x4b5b,0xa2,0xe8,0x1a,0xdc,0x7d,0x93,0xdb,0x48); +DEFINE_GUID(IID_IDWritePixelSnapping, 0xeaf3a2da,0xecf4,0x4d24,0xb6,0x44,0xb3,0x4f,0x68,0x42,0x02,0x4b); +DEFINE_GUID(IID_IDWriteTextRenderer, 0xef8a8135,0x5cc6,0x45fe,0x88,0x25,0xc5,0xa0,0x72,0x4e,0xb8,0x19); + #endif /* __INC_DWRITE__ */ |