From 3d3b1b8bbaf5e14703ed632bb5069c052149d867 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 4 Mar 2015 11:43:02 +0100 Subject: win32: fix some more -Wparentheses warnings Stupid compiler. For decode_surrogate_pair(), I changed the order of evaluation; it shouldn't matter, but this order is more readable in my opinion. (cherry picked from commit 85bf102f54cfae9945d26f1edc0e642975881dfa) --- video/out/vo_direct3d.c | 2 +- video/out/w32_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'video') diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 88eb619b8a..82a6363a62 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -940,7 +940,7 @@ render_osd: // Return the high byte of the value that represents white in chroma (U/V) static int get_chroma_clear_val(int bit_depth) { - return 1 << (bit_depth - 1 & 7); + return 1 << ((bit_depth - 1) & 7); } // this macro is supposed to work on all formats supported by 3D rendering, and diff --git a/video/out/w32_common.c b/video/out/w32_common.c index b788054070..4959b39bca 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -403,7 +403,7 @@ static int mod_state(struct vo_w32_state *w32) static int decode_surrogate_pair(wchar_t lead, wchar_t trail) { - return 0x10000 + ((lead & 0x3ff) << 10) | (trail & 0x3ff); + return 0x10000 + (((lead & 0x3ff) << 10) | (trail & 0x3ff)); } static int decode_utf16(struct vo_w32_state *w32, wchar_t c) -- cgit v1.2.3