potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-10 00:04:29 +03:00
parent 80610ca054 c35c5a47df
commit dca657a2fd
107 changed files with 492 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/stitching/src/blenders.cpp
+5 -5
View File
@@ -223,7 +223,7 @@ MultiBandBlender::MultiBandBlender(int try_gpu, int num_bands, int weight_type)
can_use_gpu_ = try_gpu && cuda::getCudaEnabledDeviceCount();
gpu_feed_idx_ = 0;
#else
(void) try_gpu;
CV_UNUSED(try_gpu);
can_use_gpu_ = false;
#endif
@@ -856,9 +856,9 @@ void createLaplacePyrGpu(InputArray img, int num_levels, std::vector<UMat> &pyr)
gpu_pyr[num_levels].download(pyr[num_levels]);
#else
(void)img;
(void)num_levels;
(void)pyr;
CV_UNUSED(img);
CV_UNUSED(num_levels);
CV_UNUSED(pyr);
CV_Error(Error::StsNotImplemented, "CUDA optimization is unavailable");
#endif
}
@@ -896,7 +896,7 @@ void restoreImageFromLaplacePyrGpu(std::vector<UMat> &pyr)
gpu_pyr[0].download(pyr[0]);
#else
(void)pyr;
CV_UNUSED(pyr);
CV_Error(Error::StsNotImplemented, "CUDA optimization is unavailable");
#endif
}
modules/stitching/src/matchers.cpp
+6 -6
View File
@@ -442,11 +442,11 @@ SurfFeaturesFinder::SurfFeaturesFinder(double hess_thresh, int num_octaves, int
extractor_ = sextractor_;
}
#else
(void)hess_thresh;
(void)num_octaves;
(void)num_layers;
(void)num_octaves_descr;
(void)num_layers_descr;
CV_UNUSED(hess_thresh);
CV_UNUSED(num_octaves);
CV_UNUSED(num_layers);
CV_UNUSED(num_octaves_descr);
CV_UNUSED(num_layers_descr);
CV_Error( Error::StsNotImplemented, "OpenCV was built without SURF support" );
#endif
}
@@ -700,7 +700,7 @@ void FeaturesMatcher::operator ()(const std::vector<ImageFeatures> &features, st
BestOf2NearestMatcher::BestOf2NearestMatcher(bool try_use_gpu, float match_conf, int num_matches_thresh1, int num_matches_thresh2)
{
(void)try_use_gpu;
CV_UNUSED(try_use_gpu);
#ifdef HAVE_OPENCV_CUDAFEATURES2D
if (try_use_gpu && getCudaEnabledDeviceCount() > 0)
modules/stitching/src/warpers_cuda.cpp
+38 -38
View File
@@ -69,7 +69,7 @@ namespace cv { namespace cuda { namespace device
static void buildWarpPlaneMaps(Size src_size, Rect dst_roi, InputArray _K, InputArray _R, InputArray _T,
float scale, OutputArray _map_x, OutputArray _map_y, Stream& stream = Stream::Null())
{
(void) src_size;
CV_UNUSED(src_size);
Mat K = _K.getMat();
Mat R = _R.getMat();
@@ -97,7 +97,7 @@ static void buildWarpPlaneMaps(Size src_size, Rect dst_roi, InputArray _K, Input
static void buildWarpSphericalMaps(Size src_size, Rect dst_roi, InputArray _K, InputArray _R, float scale,
OutputArray _map_x, OutputArray _map_y, Stream& stream = Stream::Null())
{
(void) src_size;
CV_UNUSED(src_size);
Mat K = _K.getMat();
Mat R = _R.getMat();
@@ -122,7 +122,7 @@ static void buildWarpSphericalMaps(Size src_size, Rect dst_roi, InputArray _K, I
static void buildWarpCylindricalMaps(Size src_size, Rect dst_roi, InputArray _K, InputArray _R, float scale,
OutputArray _map_x, OutputArray _map_y, Stream& stream = Stream::Null())
{
(void) src_size;
CV_UNUSED(src_size);
Mat K = _K.getMat();
Mat R = _R.getMat();
@@ -156,12 +156,12 @@ Rect cv::detail::PlaneWarperGpu::buildMaps(Size src_size, InputArray K, InputArr
cuda::GpuMat & xmap, cuda::GpuMat & ymap)
{
#ifndef HAVE_CUDA
(void)src_size;
(void)K;
(void)R;
(void)T;
(void)xmap;
(void)ymap;
CV_UNUSED(src_size);
CV_UNUSED(K);
CV_UNUSED(R);
CV_UNUSED(T);
CV_UNUSED(xmap);
CV_UNUSED(ymap);
throw_no_cuda();
#else
projector_.setCameraParams(K, R, T);
@@ -189,13 +189,13 @@ Point cv::detail::PlaneWarperGpu::warp(const cuda::GpuMat & src, InputArray K, I
cuda::GpuMat & dst)
{
#ifndef HAVE_OPENCV_CUDAWARPING
(void)src;
(void)K;
(void)R;
(void)T;
(void)interp_mode;
(void)border_mode;
(void)dst;
CV_UNUSED(src);
CV_UNUSED(K);
CV_UNUSED(R);
CV_UNUSED(T);
CV_UNUSED(interp_mode);
CV_UNUSED(border_mode);
CV_UNUSED(dst);
throw_no_cuda();
#else
Rect dst_roi = buildMaps(src.size(), K, R, T, d_xmap_, d_ymap_);
@@ -208,11 +208,11 @@ Point cv::detail::PlaneWarperGpu::warp(const cuda::GpuMat & src, InputArray K, I
Rect cv::detail::SphericalWarperGpu::buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap)
{
#ifndef HAVE_CUDA
(void)src_size;
(void)K;
(void)R;
(void)xmap;
(void)ymap;
CV_UNUSED(src_size);
CV_UNUSED(K);
CV_UNUSED(R);
CV_UNUSED(xmap);
CV_UNUSED(ymap);
throw_no_cuda();
#else
projector_.setCameraParams(K, R);
@@ -232,12 +232,12 @@ Point cv::detail::SphericalWarperGpu::warp(const cuda::GpuMat & src, InputArray
cuda::GpuMat & dst)
{
#ifndef HAVE_OPENCV_CUDAWARPING
(void)src;
(void)K;
(void)R;
(void)interp_mode;
(void)border_mode;
(void)dst;
CV_UNUSED(src);
CV_UNUSED(K);
CV_UNUSED(R);
CV_UNUSED(interp_mode);
CV_UNUSED(border_mode);
CV_UNUSED(dst);
throw_no_cuda();
#else
Rect dst_roi = buildMaps(src.size(), K, R, d_xmap_, d_ymap_);
@@ -252,11 +252,11 @@ Rect cv::detail::CylindricalWarperGpu::buildMaps(Size src_size, InputArray K, In
cuda::GpuMat & xmap, cuda::GpuMat & ymap)
{
#ifndef HAVE_CUDA
(void)src_size;
(void)K;
(void)R;
(void)xmap;
(void)ymap;
CV_UNUSED(src_size);
CV_UNUSED(K);
CV_UNUSED(R);
CV_UNUSED(xmap);
CV_UNUSED(ymap);
throw_no_cuda();
#else
projector_.setCameraParams(K, R);
@@ -276,12 +276,12 @@ Point cv::detail::CylindricalWarperGpu::warp(const cuda::GpuMat & src, InputArra
cuda::GpuMat & dst)
{
#ifndef HAVE_OPENCV_CUDAWARPING
(void)src;
(void)K;
(void)R;
(void)interp_mode;
(void)border_mode;
(void)dst;
CV_UNUSED(src);
CV_UNUSED(K);
CV_UNUSED(R);
CV_UNUSED(interp_mode);
CV_UNUSED(border_mode);
CV_UNUSED(dst);
throw_no_cuda();
#else
Rect dst_roi = buildMaps(src.size(), K, R, d_xmap_, d_ymap_);