[PATCH 1/2] d3d8: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat().
Henri Verbeet
hverbeet at codeweavers.com
Mon Apr 6 06:13:18 CDT 2020
From: Chip Davis <cdavis at codeweavers.com>
Signed-off-by: Chip Davis <cdavis at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/d3d8/device.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index cde76645155..6a67f817785 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -35,7 +35,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)
{
@@ -85,7 +86,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)
{
--
2.20.1
More information about the wine-devel
mailing list