opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-20 04:25:42 +08:00
Code Issues Releases Wiki Activity

[moved from opencv] Remove compiler warnings

Browse Source 
original commit: a7ffcaab28
This commit is contained in:
Namgoo Lee
2020-08-21 23:52:30 +09:00
parent 77a4585163
commit c7e8b709a2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cudaimgproc/test/test_histogram.cpp
View File

@@ -242,7 +242,7 @@ TEST(EqualizeHistIssue, Issue18035)
imgPaths.push_back(std::string(cvtest::TS::ptr()->get_data_path()) + "../cv/shared/graffiti.png"); imgPaths.push_back(std::string(cvtest::TS::ptr()->get_data_path()) + "../cv/shared/graffiti.png");
imgPaths.push_back(std::string(cvtest::TS::ptr()->get_data_path()) + "../cv/shared/lena.png"); imgPaths.push_back(std::string(cvtest::TS::ptr()->get_data_path()) + "../cv/shared/lena.png");
for (int i = 0; i < imgPaths.size(); ++i) for (size_t i = 0; i < imgPaths.size(); ++i)
{ {
std::string imgPath = imgPaths[i]; std::string imgPath = imgPaths[i];
cv::Mat src = cv::imread(imgPath, cv::IMREAD_GRAYSCALE); cv::Mat src = cv::imread(imgPath, cv::IMREAD_GRAYSCALE);

12
modules/cudaoptflow/src/cuda/tvl1flow.cu
View File

@@ -116,15 +116,15 @@ namespace tvl1flow
texture<float, cudaTextureType2D, cudaReadModeElementType> tex_I1y(false, cudaFilterModePoint, cudaAddressModeClamp); texture<float, cudaTextureType2D, cudaReadModeElementType> tex_I1y(false, cudaFilterModePoint, cudaAddressModeClamp);
struct SrcTexRef : SrcTex struct SrcTexRef : SrcTex
{ {
__device__ __forceinline__ float I1(float x, float y) const override __device__ __forceinline__ float I1(float x, float y) const CV_OVERRIDE
{ {
return tex2D(tex_I1, x, y); return tex2D(tex_I1, x, y);
} }
__device__ __forceinline__ float I1x(float x, float y) const override __device__ __forceinline__ float I1x(float x, float y) const CV_OVERRIDE
{ {
return tex2D(tex_I1x, x, y); return tex2D(tex_I1x, x, y);
} }
__device__ __forceinline__ float I1y(float x, float y) const override __device__ __forceinline__ float I1y(float x, float y) const CV_OVERRIDE
{ {
return tex2D(tex_I1y, x, y); return tex2D(tex_I1y, x, y);
} }
@@ -135,15 +135,15 @@ namespace tvl1flow
__host__ SrcTexObj(cudaTextureObject_t tex_obj_I1_, cudaTextureObject_t tex_obj_I1x_, cudaTextureObject_t tex_obj_I1y_) __host__ SrcTexObj(cudaTextureObject_t tex_obj_I1_, cudaTextureObject_t tex_obj_I1x_, cudaTextureObject_t tex_obj_I1y_)
: tex_obj_I1(tex_obj_I1_), tex_obj_I1x(tex_obj_I1x_), tex_obj_I1y(tex_obj_I1y_) {} : tex_obj_I1(tex_obj_I1_), tex_obj_I1x(tex_obj_I1x_), tex_obj_I1y(tex_obj_I1y_) {}
__device__ __forceinline__ float I1(float x, float y) const override __device__ __forceinline__ float I1(float x, float y) const CV_OVERRIDE
{ {
return tex2D<float>(tex_obj_I1, x, y); return tex2D<float>(tex_obj_I1, x, y);
} }
__device__ __forceinline__ float I1x(float x, float y) const override __device__ __forceinline__ float I1x(float x, float y) const CV_OVERRIDE
{ {
return tex2D<float>(tex_obj_I1x, x, y); return tex2D<float>(tex_obj_I1x, x, y);
} }
__device__ __forceinline__ float I1y(float x, float y) const override __device__ __forceinline__ float I1y(float x, float y) const CV_OVERRIDE
{ {
return tex2D<float>(tex_obj_I1y, x, y); return tex2D<float>(tex_obj_I1y, x, y);
} }