Skip to content

Commit 006067f

Browse files
committed
cleanup some cuda module warnings
1 parent bdc0518 commit 006067f

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

modules/cudacodec/include/opencv2/cudacodec.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ struct CV_EXPORTS_W_SIMPLE FormatInfo
385385
*/
386386
class CV_EXPORTS_W NVSurfaceToColorConverter {
387387
public:
388+
virtual ~NVSurfaceToColorConverter() = default;
389+
388390
/** @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.
389391
* @param yuv The raw YUV Surface output from VideoReader see @ref SurfaceFormat.
390392
* @param color The converted frame.

modules/cudacodec/src/cuda/ColorSpace.cu

+8-8
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@ __global__ static void YuvToColorKernel(uint8_t* pYuv, int nYuvPitch, uint8_t* p
160160

161161
union ColorOutx2 {
162162
Colorx2 d;
163-
Color Color[2];
163+
Color ColorArray[2];
164164
};
165165
ColorOutx2 l1Out;
166-
l1Out.Color[0] = YuvToColorForPixel<Color>(l0.x, ch.x, ch.y, videoFullRangeFlag);
167-
l1Out.Color[1] = YuvToColorForPixel<Color>(l0.y, ch.x, ch.y, videoFullRangeFlag);
166+
l1Out.ColorArray[0] = YuvToColorForPixel<Color>(l0.x, ch.x, ch.y, videoFullRangeFlag);
167+
l1Out.ColorArray[1] = YuvToColorForPixel<Color>(l0.y, ch.x, ch.y, videoFullRangeFlag);
168168
*(Colorx2*)pDst = l1Out.d;
169169
ColorOutx2 l2Out;
170-
l2Out.Color[0] = YuvToColorForPixel<Color>(l1.x, ch.x, ch.y, videoFullRangeFlag);
171-
l2Out.Color[1] = YuvToColorForPixel<Color>(l1.y, ch.x, ch.y, videoFullRangeFlag);
170+
l2Out.ColorArray[0] = YuvToColorForPixel<Color>(l1.x, ch.x, ch.y, videoFullRangeFlag);
171+
l2Out.ColorArray[1] = YuvToColorForPixel<Color>(l1.y, ch.x, ch.y, videoFullRangeFlag);
172172
*(Colorx2*)(pDst + nColorPitch) = l2Out.d;
173173
}
174174

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

215215
union ColorOutx2 {
216216
Colorx2 d;
217-
Color Color[2];
217+
Color ColorArray[2];
218218
};
219219
ColorOutx2 out;
220-
out.Color[0] = YuvToColorForPixel<Color>(l0.x, ch1.x, ch2.x, videoFullRangeFlag);
221-
out.Color[1] = YuvToColorForPixel<Color>(l0.y, ch1.y, ch2.y, videoFullRangeFlag);
220+
out.ColorArray[0] = YuvToColorForPixel<Color>(l0.x, ch1.x, ch2.x, videoFullRangeFlag);
221+
out.ColorArray[1] = YuvToColorForPixel<Color>(l0.y, ch1.y, ch2.y, videoFullRangeFlag);
222222
*(Colorx2*)pDst = out.d;
223223
}
224224

modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp

+2-2
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() 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 override = 0;
126126

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

0 commit comments

Comments
 (0)