Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup some cuda module warnings #3902

Open
wants to merge 1 commit into
base: 4.x
Choose a base branch
from
Open
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
2 changes: 2 additions & 0 deletions modules/cudacodec/include/opencv2/cudacodec.hpp
Original file line number Diff line number Diff line change
@@ -385,6 +385,8 @@ struct CV_EXPORTS_W_SIMPLE FormatInfo
*/
class CV_EXPORTS_W NVSurfaceToColorConverter {
public:
virtual ~NVSurfaceToColorConverter() = default;

/** @brief Performs the conversion from the raw YUV Surface output from VideoReader to the requested color format. Use this function when you want to convert the raw YUV Surface output from VideoReader to more than one color format or you want both the raw Surface output in addition to a color frame.
* @param yuv The raw YUV Surface output from VideoReader see @ref SurfaceFormat.
* @param color The converted frame.
16 changes: 8 additions & 8 deletions modules/cudacodec/src/cuda/ColorSpace.cu
Original file line number Diff line number Diff line change
@@ -160,15 +160,15 @@ __global__ static void YuvToColorKernel(uint8_t* pYuv, int nYuvPitch, uint8_t* p

union ColorOutx2 {
Colorx2 d;
Color Color[2];
Color ColorArray[2];
};
ColorOutx2 l1Out;
l1Out.Color[0] = YuvToColorForPixel<Color>(l0.x, ch.x, ch.y, videoFullRangeFlag);
l1Out.Color[1] = YuvToColorForPixel<Color>(l0.y, ch.x, ch.y, videoFullRangeFlag);
l1Out.ColorArray[0] = YuvToColorForPixel<Color>(l0.x, ch.x, ch.y, videoFullRangeFlag);
l1Out.ColorArray[1] = YuvToColorForPixel<Color>(l0.y, ch.x, ch.y, videoFullRangeFlag);
*(Colorx2*)pDst = l1Out.d;
ColorOutx2 l2Out;
l2Out.Color[0] = YuvToColorForPixel<Color>(l1.x, ch.x, ch.y, videoFullRangeFlag);
l2Out.Color[1] = YuvToColorForPixel<Color>(l1.y, ch.x, ch.y, videoFullRangeFlag);
l2Out.ColorArray[0] = YuvToColorForPixel<Color>(l1.x, ch.x, ch.y, videoFullRangeFlag);
l2Out.ColorArray[1] = YuvToColorForPixel<Color>(l1.y, ch.x, ch.y, videoFullRangeFlag);
*(Colorx2*)(pDst + nColorPitch) = l2Out.d;
}

@@ -214,11 +214,11 @@ __global__ static void Yuv444ToColorKernel(uint8_t* pYuv, int nYuvPitch, uint8_t

union ColorOutx2 {
Colorx2 d;
Color Color[2];
Color ColorArray[2];
};
ColorOutx2 out;
out.Color[0] = YuvToColorForPixel<Color>(l0.x, ch1.x, ch2.x, videoFullRangeFlag);
out.Color[1] = YuvToColorForPixel<Color>(l0.y, ch1.y, ch2.y, videoFullRangeFlag);
out.ColorArray[0] = YuvToColorForPixel<Color>(l0.x, ch1.x, ch2.x, videoFullRangeFlag);
out.ColorArray[1] = YuvToColorForPixel<Color>(l0.y, ch1.y, ch2.y, videoFullRangeFlag);
*(Colorx2*)pDst = out.d;
}

4 changes: 2 additions & 2 deletions modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp
Original file line number Diff line number Diff line change
@@ -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() 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 override = 0;

/** @brief Trains a descriptor matcher.