From 4102aaaf157027e3afd34721a47ed9117cfd2563 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Fri, 7 Dec 2012 14:16:18 +0400 Subject: [PATCH] fixed compilation of color.cu under windows x86 it was some bug in nvcc (it fails on this file) --- modules/gpu/include/opencv2/gpu/device/detail/color_detail.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gpu/include/opencv2/gpu/device/detail/color_detail.hpp b/modules/gpu/include/opencv2/gpu/device/detail/color_detail.hpp index 981e623..fb3bfeb 100644 --- a/modules/gpu/include/opencv2/gpu/device/detail/color_detail.hpp +++ b/modules/gpu/include/opencv2/gpu/device/detail/color_detail.hpp @@ -807,9 +807,9 @@ namespace cv { namespace gpu { namespace device template static __device__ __forceinline__ void RGB2XYZConvert(const T* src, D& dst) { + dst.z = saturate_cast(CV_DESCALE(src[bidx^2] * c_RGB2XYZ_D65i[6] + src[1] * c_RGB2XYZ_D65i[7] + src[bidx] * c_RGB2XYZ_D65i[8], xyz_shift)); dst.x = saturate_cast(CV_DESCALE(src[bidx^2] * c_RGB2XYZ_D65i[0] + src[1] * c_RGB2XYZ_D65i[1] + src[bidx] * c_RGB2XYZ_D65i[2], xyz_shift)); dst.y = saturate_cast(CV_DESCALE(src[bidx^2] * c_RGB2XYZ_D65i[3] + src[1] * c_RGB2XYZ_D65i[4] + src[bidx] * c_RGB2XYZ_D65i[5], xyz_shift)); - dst.z = saturate_cast(CV_DESCALE(src[bidx^2] * c_RGB2XYZ_D65i[6] + src[1] * c_RGB2XYZ_D65i[7] + src[bidx] * c_RGB2XYZ_D65i[8], xyz_shift)); } template static __device__ __forceinline__ uint RGB2XYZConvert(uint src) -- 2.7.4