[PATCH 0/2] MR4628: configure: Enable -Wenum-conversion warnings.

[Jacek Caban (＠jacek)]

Clang enables -Wenum-conversion by default. GCC does not, so this makes both configurations more similar.

The extra dwrite is for Clang -Wenum-float-conversion warning, which is not enabled by default, but it's enabled when -Wenum-conversion is specified.

[PATCH 1/2] dwrite: Explicitly cast DWRITE_FONT_STRETCH to float in init_font_prop_vec.

[Jacek Caban]

From: Jacek Caban

---
 dlls/dwrite/font.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index 6a3e49dcc58..2028440ca8e 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -685,7 +685,7 @@ static void init_font_prop_vec(DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STRETCH st
     struct dwrite_font_propvec *vec)
 {
     vec->stretch = ((INT32)stretch - DWRITE_FONT_STRETCH_NORMAL) * 11.0f;
-    vec->style = style * 7.0f;
+    vec->style = (float)style * 7.0f;
     vec->weight = ((INT32)weight - DWRITE_FONT_WEIGHT_NORMAL) / 100.0f * 5.0f;
 }

[PATCH 2/2] configure: Enable -Wenum-conversion warnings.

[Jacek Caban]

From: Jacek Caban

---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index 26bcc3f6c21..a18910bb07e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -988,6 +988,7 @@ This is an error since --enable-archs=$wine_arch was requested.])])
     WINE_TRY_PE_CFLAGS([-Wpointer-arith])
     WINE_TRY_PE_CFLAGS([-Wlogical-op])
     WINE_TRY_PE_CFLAGS([-Wabsolute-value])
+    WINE_TRY_PE_CFLAGS([-Wenum-conversion])

case $wine_arch in
       i386) WINE_TRY_PE_CFLAGS([-fno-omit-frame-pointer])

[PATCH 0/2] MR4628: configure: Enable -Wenum-conversion warnings. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.