From ed6885dd8bd75e90fc66630212cf455f2b2927f1 Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Fri, 28 Sep 2012 14:02:21 +0400 Subject: [PATCH] fixed bit arifmetic in sft-based integral --- modules/gpu/src/cuda/integral_image.cu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gpu/src/cuda/integral_image.cu b/modules/gpu/src/cuda/integral_image.cu index ec3b16657..0405f6670 100644 --- a/modules/gpu/src/cuda/integral_image.cu +++ b/modules/gpu/src/cuda/integral_image.cu @@ -50,10 +50,10 @@ namespace cv { namespace gpu { namespace device __device__ uchar4 int_to_uchar4(unsigned int in) { uchar4 bytes; - bytes.x = (in && 0x000000ff) >> 0; - bytes.y = (in && 0x0000ff00) >> 8; - bytes.z = (in && 0x00ff0000) >> 16; - bytes.w = (in && 0xff000000) >> 24; + bytes.x = (in & 0x000000ff) >> 0; + bytes.y = (in & 0x0000ff00) >> 8; + bytes.z = (in & 0x00ff0000) >> 16; + bytes.w = (in & 0xff000000) >> 24; return bytes; }