fix build error on Jetson TX1 and TX2

* enable_if_t and is_base_of is c++14 feature
 * override is c++11 feature
pull/17581/head
Tomoaki Teshima 5 years ago
parent 6bd87e8146
commit c07af090f5
  1. 7
      modules/cudaimgproc/src/cuda/canny.cu

@ -107,7 +107,7 @@ namespace canny
{ {
__host__ SrcTexRef(int _xoff, int _yoff) : SrcTex(_xoff, _yoff) {} __host__ SrcTexRef(int _xoff, int _yoff) : SrcTex(_xoff, _yoff) {}
__device__ __forceinline__ int operator ()(int y, int x) const override __device__ __forceinline__ int operator ()(int y, int x) const
{ {
return tex2D(tex_src, x + xoff, y + yoff); return tex2D(tex_src, x + xoff, y + yoff);
} }
@ -117,7 +117,7 @@ namespace canny
{ {
__host__ SrcTexObj(int _xoff, int _yoff, cudaTextureObject_t _tex_src_object) : SrcTex(_xoff, _yoff), tex_src_object(_tex_src_object) { } __host__ SrcTexObj(int _xoff, int _yoff, cudaTextureObject_t _tex_src_object) : SrcTex(_xoff, _yoff), tex_src_object(_tex_src_object) { }
__device__ __forceinline__ int operator ()(int y, int x) const override __device__ __forceinline__ int operator ()(int y, int x) const
{ {
return tex2D<uchar>(tex_src_object, x + xoff, y + yoff); return tex2D<uchar>(tex_src_object, x + xoff, y + yoff);
} }
@ -127,8 +127,7 @@ namespace canny
template < template <
class T, class T,
class Norm, class Norm
typename = std::enable_if_t<std::is_base_of<SrcTex, T>::value>
> >
__global__ void calcMagnitudeKernel(const T src, PtrStepi dx, PtrStepi dy, PtrStepSzf mag, const Norm norm) __global__ void calcMagnitudeKernel(const T src, PtrStepi dx, PtrStepi dy, PtrStepSzf mag, const Norm norm)
{ {

Loading…
Cancel
Save