From 27302c367cdd8636a0cd0dd290cc0fbfe0555f6b Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Tue, 7 Apr 2015 13:04:31 +0300 Subject: [PATCH] fix GPU WARP border mode in CUDA 7.0 and Maxwell architecture --- .../gpu/include/opencv2/gpu/device/border_interpolate.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gpu/include/opencv2/gpu/device/border_interpolate.hpp b/modules/gpu/include/opencv2/gpu/device/border_interpolate.hpp index 2ec97435eb..693ba2167d 100644 --- a/modules/gpu/include/opencv2/gpu/device/border_interpolate.hpp +++ b/modules/gpu/include/opencv2/gpu/device/border_interpolate.hpp @@ -626,12 +626,12 @@ namespace cv { namespace gpu { namespace device __device__ __forceinline__ int idx_row_low(int y) const { - return (y >= 0) * y + (y < 0) * (y - ((y - height + 1) / height) * height); + return (y >= 0) ? y : (y - ((y - height + 1) / height) * height); } __device__ __forceinline__ int idx_row_high(int y) const { - return (y < height) * y + (y >= height) * (y % height); + return (y < height) ? y : (y % height); } __device__ __forceinline__ int idx_row(int y) const @@ -641,12 +641,12 @@ namespace cv { namespace gpu { namespace device __device__ __forceinline__ int idx_col_low(int x) const { - return (x >= 0) * x + (x < 0) * (x - ((x - width + 1) / width) * width); + return (x >= 0) ? x : (x - ((x - width + 1) / width) * width); } __device__ __forceinline__ int idx_col_high(int x) const { - return (x < width) * x + (x >= width) * (x % width); + return (x < width) ? x : (x % width); } __device__ __forceinline__ int idx_col(int x) const