From: Ilya Lavrenov Date: Thu, 3 Sep 2015 16:13:00 +0000 (+0300) Subject: fixed warnings in gpu module X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1314^2~68^2~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0422054aa196347b706d682e223605d76ca38c64;p=platform%2Fupstream%2Fopencv.git fixed warnings in gpu module (cherry picked from commit 6a05939e1ce552008ecf95451ddf362f2be7a4c3) --- diff --git a/modules/gpu/src/element_operations.cpp b/modules/gpu/src/element_operations.cpp index 780745d..280f85a 100644 --- a/modules/gpu/src/element_operations.cpp +++ b/modules/gpu/src/element_operations.cpp @@ -2804,7 +2804,7 @@ void cv::gpu::bitwise_not(const GpuMat& src, GpuMat& dst, const GpuMat& mask, St } else { - const int elem_size = src.elemSize1(); + const int elem_size = static_cast(src.elemSize1()); const int num_channels = src.channels(); const int bcols = src.cols * num_channels; @@ -2895,7 +2895,7 @@ void cv::gpu::bitwise_and(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, c } else { - const int elem_size = src1.elemSize1(); + const int elem_size = static_cast(src1.elemSize1()); const int num_channels = src1.channels(); const int bcols = src1.cols * num_channels; @@ -2979,7 +2979,7 @@ void cv::gpu::bitwise_or(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, co } else { - const int elem_size = src1.elemSize1(); + const int elem_size = static_cast(src1.elemSize1()); const int num_channels = src1.channels(); const int bcols = src1.cols * num_channels; @@ -3063,7 +3063,7 @@ void cv::gpu::bitwise_xor(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, c } else { - const int elem_size = src1.elemSize1(); + const int elem_size = static_cast(src1.elemSize1()); const int num_channels = src1.channels(); const int bcols = src1.cols * num_channels;