From 25f33a7e305dc9e35e2b63ce107dc220c46db336 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Thu, 18 Dec 2014 11:36:43 +0300 Subject: [PATCH] update cudev color conversions according to the latest changes in CPU code --- .../include/opencv2/cudev/functional/detail/color_cvt.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp b/modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp index 9b20fcc2c6..b2c9ae53e6 100644 --- a/modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp +++ b/modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp @@ -797,8 +797,7 @@ namespace color_cvt_detail if (diff > numeric_limits::epsilon()) { - s = (l < 0.5f) * diff / (vmax + vmin); - s += (l >= 0.5f) * diff / (2.0f - vmax - vmin); + s = l < 0.5f ? diff / (vmax + vmin) : diff / (2 - vmax - vmin); diff = 60.f / diff; @@ -1190,7 +1189,7 @@ namespace color_cvt_detail dst.x = saturate_cast(buf.x * 2.55f); dst.y = saturate_cast(buf.y * 0.72033898305084743f + 96.525423728813564f); - dst.z = saturate_cast(buf.z * 0.99609375f + 139.453125f); + dst.z = saturate_cast(buf.z * 0.9732824427480916f + 136.259541984732824f); return dst; } @@ -1255,7 +1254,7 @@ namespace color_cvt_detail buf.x = src.x * (100.f / 255.f); buf.y = src.y * 1.388235294117647f - 134.f; - buf.z = src.z * 1.003921568627451f - 140.f; + buf.z = src.z * 1.027450980392157f - 140.f; Luv2RGB cvtf; buf = cvtf(buf);