Skip to content

W
wine-winehq
Commit 31d9d0f7 authored by Chip Davis's avatar Chip Davis Committed by Alexandre Julliard
Browse files
Options

d3d9: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and…

d3d9: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat(). Signed-off-by: 's avatarChip Davis <cdavis@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 36cd136a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/d3d9/device.c
View file @ 31d9d0f7
......@@ -44,7 +44,8 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format)
BYTE *c = (BYTE *)&format;
/* Don't translate FOURCC formats */
if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format;
if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3]))
return (D3DFORMAT)format;
switch(format)
{
......@@ -108,7 +109,8 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format)
BYTE *c = (BYTE *)&format;
/* Don't translate FOURCC formats */
if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format;
if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3]))
return (enum wined3d_format_id)format;
switch(format)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment