Nikolay Sivov : dwrite: Fix compilation failure regarding nameless unions.
Alexandre Julliard
julliard at winehq.org
Thu Jul 20 12:11:30 CDT 2017
Module: wine
Branch: stable
Commit: b1f22c7a7d2bb1021d5af69d2960d862993e8e78
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f22c7a7d2bb1021d5af69d2960d862993e8e78
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed May 10 17:16:10 2017 +0300
dwrite: Fix compilation failure regarding nameless unions.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit af54ed51b00db42be1adade1c8a2fb2dcf837edc)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/dwrite/opentype.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index c829813..2876799 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -19,6 +19,7 @@
*/
#define COBJMACROS
+#define NONAMELESSUNION
#include "dwrite_private.h"
#include "winternl.h"
@@ -1860,10 +1861,10 @@ HRESULT opentype_get_cpal_entries(const void *cpal, UINT32 palette, UINT32 first
first_entry_index += GET_BE_WORD(header->colorRecordIndices[palette]);
for (i = 0; i < entry_count; i++) {
- entries[i].r = records[first_entry_index + i].red / 255.0f;
- entries[i].g = records[first_entry_index + i].green / 255.0f;
- entries[i].b = records[first_entry_index + i].blue / 255.0f;
- entries[i].a = records[first_entry_index + i].alpha / 255.0f;
+ entries[i].u1.r = records[first_entry_index + i].red / 255.0f;
+ entries[i].u2.g = records[first_entry_index + i].green / 255.0f;
+ entries[i].u3.b = records[first_entry_index + i].blue / 255.0f;
+ entries[i].u4.a = records[first_entry_index + i].alpha / 255.0f;
}
return S_OK;
More information about the wine-cvs
mailing list