Skip to content

Commit c07af09

Browse files
committed
fix build error on Jetson TX1 and TX2
* enable_if_t and is_base_of is c++14 feature * override is c++11 feature
1 parent 6bd87e8 commit c07af09

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

modules/cudaimgproc/src/cuda/canny.cu

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ namespace canny
107107
{
108108
__host__ SrcTexRef(int _xoff, int _yoff) : SrcTex(_xoff, _yoff) {}
109109

110-
__device__ __forceinline__ int operator ()(int y, int x) const override
110+
__device__ __forceinline__ int operator ()(int y, int x) const
111111
{
112112
return tex2D(tex_src, x + xoff, y + yoff);
113113
}
@@ -117,7 +117,7 @@ namespace canny
117117
{
118118
__host__ SrcTexObj(int _xoff, int _yoff, cudaTextureObject_t _tex_src_object) : SrcTex(_xoff, _yoff), tex_src_object(_tex_src_object) { }
119119

120-
__device__ __forceinline__ int operator ()(int y, int x) const override
120+
__device__ __forceinline__ int operator ()(int y, int x) const
121121
{
122122
return tex2D<uchar>(tex_src_object, x + xoff, y + yoff);
123123
}
@@ -127,8 +127,7 @@ namespace canny
127127

128128
template <
129129
class T,
130-
class Norm,
131-
typename = std::enable_if_t<std::is_base_of<SrcTex, T>::value>
130+
class Norm
132131
>
133132
__global__ void calcMagnitudeKernel(const T src, PtrStepi dx, PtrStepi dy, PtrStepSzf mag, const Norm norm)
134133
{

0 commit comments

Comments
 (0)