Module: wine Branch: master Commit: af54ed51b00db42be1adade1c8a2fb2dcf837edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=af54ed51b00db42be1adade1c8...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed May 10 17:16:10 2017 +0300
dwrite: Fix compilation failure regarding nameless unions.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@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 5f2de23..a66500a 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" @@ -1900,10 +1901,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;