Skip to content

Commit a7ffcaa

Browse files
committed
Remove compiler warnings
1 parent f617f18 commit a7ffcaa

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

modules/cudaimgproc/test/test_histogram.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ TEST(EqualizeHistIssue, Issue18035)
242242
imgPaths.push_back(std::string(cvtest::TS::ptr()->get_data_path()) + "../cv/shared/graffiti.png");
243243
imgPaths.push_back(std::string(cvtest::TS::ptr()->get_data_path()) + "../cv/shared/lena.png");
244244

245-
for (int i = 0; i < imgPaths.size(); ++i)
245+
for (size_t i = 0; i < imgPaths.size(); ++i)
246246
{
247247
std::string imgPath = imgPaths[i];
248248
cv::Mat src = cv::imread(imgPath, cv::IMREAD_GRAYSCALE);

modules/cudaoptflow/src/cuda/tvl1flow.cu

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ namespace tvl1flow
116116
texture<float, cudaTextureType2D, cudaReadModeElementType> tex_I1y(false, cudaFilterModePoint, cudaAddressModeClamp);
117117
struct SrcTexRef : SrcTex
118118
{
119-
__device__ __forceinline__ float I1(float x, float y) const override
119+
__device__ __forceinline__ float I1(float x, float y) const CV_OVERRIDE
120120
{
121121
return tex2D(tex_I1, x, y);
122122
}
123-
__device__ __forceinline__ float I1x(float x, float y) const override
123+
__device__ __forceinline__ float I1x(float x, float y) const CV_OVERRIDE
124124
{
125125
return tex2D(tex_I1x, x, y);
126126
}
127-
__device__ __forceinline__ float I1y(float x, float y) const override
127+
__device__ __forceinline__ float I1y(float x, float y) const CV_OVERRIDE
128128
{
129129
return tex2D(tex_I1y, x, y);
130130
}
@@ -135,15 +135,15 @@ namespace tvl1flow
135135
__host__ SrcTexObj(cudaTextureObject_t tex_obj_I1_, cudaTextureObject_t tex_obj_I1x_, cudaTextureObject_t tex_obj_I1y_)
136136
: tex_obj_I1(tex_obj_I1_), tex_obj_I1x(tex_obj_I1x_), tex_obj_I1y(tex_obj_I1y_) {}
137137

138-
__device__ __forceinline__ float I1(float x, float y) const override
138+
__device__ __forceinline__ float I1(float x, float y) const CV_OVERRIDE
139139
{
140140
return tex2D<float>(tex_obj_I1, x, y);
141141
}
142-
__device__ __forceinline__ float I1x(float x, float y) const override
142+
__device__ __forceinline__ float I1x(float x, float y) const CV_OVERRIDE
143143
{
144144
return tex2D<float>(tex_obj_I1x, x, y);
145145
}
146-
__device__ __forceinline__ float I1y(float x, float y) const override
146+
__device__ __forceinline__ float I1y(float x, float y) const CV_OVERRIDE
147147
{
148148
return tex2D<float>(tex_obj_I1y, x, y);
149149
}

0 commit comments

Comments
 (0)