Skip to content

O
opencv_contrib
Commit 84ac312f authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

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

parents 4a80c18c 09fc4303
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
modules/ovis/src/ovis.cpp
View file @ 84ac312f
...@@ -442,7 +442,7 @@ public: ...@@ -442,7 +442,7 @@ public:
dst_type = CV_32FC4; dst_type = CV_32FC4;
break; break;
case PF_L16: case PF_L16:
case PF_DEPTH16: case PF_DEPTH:
dst_type = CV_16U; dst_type = CV_16U;
break; break;
default: default:
......
modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc
View file @ 84ac312f
...@@ -430,7 +430,10 @@ void EuclideanBundlePointsOnly(const DistortionModelType distortion_model, ...@@ -430,7 +430,10 @@ void EuclideanBundlePointsOnly(const DistortionModelType distortion_model,
#ifdef _OPENMP #ifdef _OPENMP
options.num_threads = omp_get_max_threads(); options.num_threads = omp_get_max_threads();
#if CERES_VERSION_MAJOR <= 1 && CERES_VERSION_MINOR <= 13
// deprecated since Ceres 1.14.0
options.num_linear_solver_threads = omp_get_max_threads(); options.num_linear_solver_threads = omp_get_max_threads();
#endif
#endif #endif
// Solve! // Solve!
...@@ -600,7 +603,10 @@ void EuclideanBundleCommonIntrinsics( ...@@ -600,7 +603,10 @@ void EuclideanBundleCommonIntrinsics(
#ifdef _OPENMP #ifdef _OPENMP
options.num_threads = omp_get_max_threads(); options.num_threads = omp_get_max_threads();
#if CERES_VERSION_MAJOR <= 1 && CERES_VERSION_MINOR <= 13
// deprecated since Ceres 1.14.0
options.num_linear_solver_threads = omp_get_max_threads(); options.num_linear_solver_threads = omp_get_max_threads();
#endif
#endif #endif
// Solve! // Solve!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment