Skip to content

Commit d568359

Browse files
authored
Merge pull request #4098 from asmorkalov:as/cuda_warn_fix
Fixed build warnings in CUDA.
2 parents 2ac61cd + 86ff885 commit d568359

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

modules/cudacodec/include/opencv2/cudacodec.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ class CV_EXPORTS_W NVSurfaceToColorConverter {
395395
* @param stream Stream for the asynchronous version.
396396
*/
397397
CV_WRAP virtual bool convert(InputArray yuv, OutputArray color, const SurfaceFormat surfaceFormat, const ColorFormat outputFormat, const BitDepth bitDepth = BitDepth::UNCHANGED, const bool planar = false, cuda::Stream& stream = cuda::Stream::Null()) = 0;
398+
virtual ~NVSurfaceToColorConverter() {};
398399
};
399400

400401
/** @brief Creates a NVSurfaceToColorConverter.

modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ class CV_EXPORTS_W DescriptorMatcher : public cv::Algorithm
118118

119119
/** @brief Clears the train descriptor collection.
120120
*/
121-
CV_WRAP virtual void clear() = 0;
121+
CV_WRAP virtual void clear() CV_OVERRIDE = 0;
122122

123123
/** @brief Returns true if there are no train descriptors in the collection.
124124
*/
125-
CV_WRAP virtual bool empty() const = 0;
125+
CV_WRAP virtual bool empty() const CV_OVERRIDE = 0;
126126

127127
/** @brief Trains a descriptor matcher.
128128

0 commit comments

Comments
 (0)