Skip to content

Commit f435b66

Browse files
committed
Merge pull request #1912 from huangqinjin:ceres
2 parents f0ecc09 + 35da439 commit f435b66

File tree

1 file changed

+6
-0
lines changed
  • modules/sfm/src/libmv_light/libmv/simple_pipeline

1 file changed

+6
-0
lines changed

modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,10 @@ void EuclideanBundlePointsOnly(const DistortionModelType distortion_model,
430430

431431
#ifdef _OPENMP
432432
options.num_threads = omp_get_max_threads();
433+
#if CERES_VERSION_MAJOR <= 1 && CERES_VERSION_MINOR <= 13
434+
// deprecated since Ceres 1.14.0
433435
options.num_linear_solver_threads = omp_get_max_threads();
436+
#endif
434437
#endif
435438

436439
// Solve!
@@ -600,7 +603,10 @@ void EuclideanBundleCommonIntrinsics(
600603

601604
#ifdef _OPENMP
602605
options.num_threads = omp_get_max_threads();
606+
#if CERES_VERSION_MAJOR <= 1 && CERES_VERSION_MINOR <= 13
607+
// deprecated since Ceres 1.14.0
603608
options.num_linear_solver_threads = omp_get_max_threads();
609+
#endif
604610
#endif
605611

606612
// Solve!

0 commit comments

Comments
 (0)