From be9800e8da4ba929acde2c814889f7bc1669c7be Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey@blender.org>
Date: Tue, 10 May 2022 16:36:22 +0200
Subject: Update Ceres to latest upstream version 2.1.0

This release deprecated the Parameterization API and the new Manifolds
API is to be used instead. This is what was done in the Libmv as part
of this change.

Additionally, remove the bundling scripts. Nowadays those are only
leading to a duplicated work to maintain.

No measurable changes on user side is expected.
---
 intern/libmv/CMakeLists.txt                        |  1 -
 intern/libmv/bundle.sh                             |  1 -
 intern/libmv/libmv/simple_pipeline/bundle.cc       | 17 ++++++++---------
 intern/libmv/libmv/simple_pipeline/modal_solver.cc |  9 ++++-----
 4 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'intern')

diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
index f9fef9f7a29..e0ed68eb20e 100644
--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -26,7 +26,6 @@ if(WITH_LIBMV)
   endif()
   add_definitions(${GFLAGS_DEFINES})
   add_definitions(${GLOG_DEFINES})
-  add_definitions(${CERES_DEFINES})
   add_definitions(-DLIBMV_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
 
   list(APPEND INC
diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh
index 6808e244c05..82293068745 100755
--- a/intern/libmv/bundle.sh
+++ b/intern/libmv/bundle.sh
@@ -124,7 +124,6 @@ if(WITH_LIBMV)
   endif()
   add_definitions(\${GFLAGS_DEFINES})
   add_definitions(\${GLOG_DEFINES})
-  add_definitions(\${CERES_DEFINES})
   add_definitions(-DLIBMV_GFLAGS_NAMESPACE=\${GFLAGS_NAMESPACE})
 
   list(APPEND INC
diff --git a/intern/libmv/libmv/simple_pipeline/bundle.cc b/intern/libmv/libmv/simple_pipeline/bundle.cc
index e86c3bca57f..355c167d000 100644
--- a/intern/libmv/libmv/simple_pipeline/bundle.cc
+++ b/intern/libmv/libmv/simple_pipeline/bundle.cc
@@ -685,7 +685,7 @@ void EuclideanBundleCommonIntrinsics(const Tracks& tracks,
       PackCamerasRotationAndTranslation(*reconstruction);
 
   // Parameterization used to restrict camera motion for modal solvers.
-  ceres::SubsetParameterization* constant_translation_parameterization = NULL;
+  ceres::SubsetManifold* constant_translation_manifold = NULL;
   if (bundle_constraints & BUNDLE_NO_TRANSLATION) {
     std::vector<int> constant_translation;
 
@@ -694,8 +694,8 @@ void EuclideanBundleCommonIntrinsics(const Tracks& tracks,
     constant_translation.push_back(4);
     constant_translation.push_back(5);
 
-    constant_translation_parameterization =
-        new ceres::SubsetParameterization(6, constant_translation);
+    constant_translation_manifold =
+        new ceres::SubsetManifold(6, constant_translation);
   }
 
   // Add residual blocks to the problem.
@@ -735,8 +735,7 @@ void EuclideanBundleCommonIntrinsics(const Tracks& tracks,
       }
 
       if (bundle_constraints & BUNDLE_NO_TRANSLATION) {
-        problem.SetParameterization(current_camera_R_t,
-                                    constant_translation_parameterization);
+        problem.SetManifold(current_camera_R_t, constant_translation_manifold);
       }
 
       zero_weight_tracks_flags[marker.track] = false;
@@ -787,11 +786,11 @@ void EuclideanBundleCommonIntrinsics(const Tracks& tracks,
 #undef MAYBE_SET_CONSTANT
 
     if (!constant_intrinsics.empty()) {
-      ceres::SubsetParameterization* subset_parameterization =
-          new ceres::SubsetParameterization(PackedIntrinsics::NUM_PARAMETERS,
-                                            constant_intrinsics);
+      ceres::SubsetManifold* subset_parameterization =
+          new ceres::SubsetManifold(PackedIntrinsics::NUM_PARAMETERS,
+                                    constant_intrinsics);
 
-      problem.SetParameterization(intrinsics_block, subset_parameterization);
+      problem.SetManifold(intrinsics_block, subset_parameterization);
     }
   }
 
diff --git a/intern/libmv/libmv/simple_pipeline/modal_solver.cc b/intern/libmv/libmv/simple_pipeline/modal_solver.cc
index 845b299e31e..206d264f1f8 100644
--- a/intern/libmv/libmv/simple_pipeline/modal_solver.cc
+++ b/intern/libmv/libmv/simple_pipeline/modal_solver.cc
@@ -180,7 +180,7 @@ void ModalSolver(const Tracks& tracks,
 
     // NOTE: Parameterization is lazily initialized when it is really needed,
     // and is re-used by all parameters block.
-    ceres::LocalParameterization* quaternion_parameterization = NULL;
+    ceres::Manifold* quaternion_manifold = NULL;
 
     int num_residuals = 0;
     for (int i = 0; i < all_markers.size(); ++i) {
@@ -197,12 +197,11 @@ void ModalSolver(const Tracks& tracks,
             &quaternion(0));
         num_residuals++;
 
-        if (quaternion_parameterization == NULL) {
-          quaternion_parameterization = new ceres::QuaternionParameterization();
+        if (quaternion_manifold == NULL) {
+          quaternion_manifold = new ceres::QuaternionManifold();
         }
 
-        problem.SetParameterization(&quaternion(0),
-                                    quaternion_parameterization);
+        problem.SetManifold(&quaternion(0), quaternion_manifold);
       }
     }
 
-- 
cgit v1.2.3