From 13d1ee10be80e40df015ac5cec82311ca690c321 Mon Sep 17 00:00:00 2001 From: Andreas Franek Date: Mon, 18 Jul 2016 14:31:16 +0200 Subject: [PATCH] replaced static const members with static functions for msvc cpmpatability --- modules/cudaoptflow/src/cuda/pyrlk.cu | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/cudaoptflow/src/cuda/pyrlk.cu b/modules/cudaoptflow/src/cuda/pyrlk.cu index 5c81edface..2f2865057f 100644 --- a/modules/cudaoptflow/src/cuda/pyrlk.cu +++ b/modules/cudaoptflow/src/cuda/pyrlk.cu @@ -347,13 +347,19 @@ namespace pyrlk template struct DenormalizationFactor { - static const float factor = 1.0; + static __device__ __forceinline__ float factor() + { + return 1.0f; + } }; template <> struct DenormalizationFactor { - static const float factor = 255.0; + static __device__ __forceinline__ float factor() + { + return 255.0f; + } }; template @@ -544,7 +550,7 @@ namespace pyrlk nextPts[blockIdx.x] = nextPt; if (calcErr) - err[blockIdx.x] = static_cast(errval) / (::min(cn, 3) * c_winSize_x * c_winSize_y) * DenormalizationFactor::factor; + err[blockIdx.x] = static_cast(errval) / (::min(cn, 3) * c_winSize_x * c_winSize_y) * DenormalizationFactor::factor(); } }