From 828091cfbb18be6f0e44e331c052cf9d95d6eddf Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Thu, 25 Oct 2018 13:27:17 -0400 Subject: [PATCH] Fixed #12933: added cast to silence clang -Wcomma warning --- modules/core/include/opencv2/core/cvdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h index 558ce2dfb4..c8c2a7498d 100644 --- a/modules/core/include/opencv2/core/cvdef.h +++ b/modules/core/include/opencv2/core/cvdef.h @@ -814,7 +814,7 @@ protected: out.u = t + (1 << 23); out.u = (e >= 0x7c00 ? t + 0x38000000 : - e == 0 ? (out.f -= 6.103515625e-05f, out.u) : t) | sign; + e == 0 ? (static_cast(out.f -= 6.103515625e-05f), out.u) : t) | sign; return out.f; #endif }