Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/cudacodec/include/opencv2/cudacodec.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ class CV_EXPORTS_W NVSurfaceToColorConverter {
* @param stream Stream for the asynchronous version.
*/
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;
virtual ~NVSurfaceToColorConverter() {};
};

/** @brief Creates a NVSurfaceToColorConverter.
Expand Down
4 changes: 2 additions & 2 deletions modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ class CV_EXPORTS_W DescriptorMatcher : public cv::Algorithm

/** @brief Clears the train descriptor collection.
*/
CV_WRAP virtual void clear() = 0;
CV_WRAP virtual void clear() CV_OVERRIDE = 0;

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

/** @brief Trains a descriptor matcher.

Expand Down