[Bf-blender-cvs] [805c52b1fdb] master: Libmv: Cleanup, naming

Sergey Sharybin noreply at git.blender.org
Tue Apr 21 16:46:16 CEST 2020


Commit: 805c52b1fdb5ac6a0caf8276bf0d13c324c57716
Author: Sergey Sharybin
Date:   Tue Apr 21 16:41:23 2020 +0200
Branches: master
https://developer.blender.org/rB805c52b1fdb5ac6a0caf8276bf0d13c324c57716

Libmv: Cleanup, naming

Initial bundle adjustment only supported OpenCV's radial distortion
model, so the cost functor was called after it.

Nowadays it supports more than this single model, so naming was a bit
wrong and misleading.

===================================================================

M	intern/libmv/libmv/simple_pipeline/bundle.cc

===================================================================

diff --git a/intern/libmv/libmv/simple_pipeline/bundle.cc b/intern/libmv/libmv/simple_pipeline/bundle.cc
index fb59e20d84c..2976dd5053f 100644
--- a/intern/libmv/libmv/simple_pipeline/bundle.cc
+++ b/intern/libmv/libmv/simple_pipeline/bundle.cc
@@ -138,8 +138,8 @@ void ApplyDistortionModelUsingIntrinsicsBlock(
 //
 // This functor can only be used for distortion models which have analytically
 // defined Apply() function.
-struct OpenCVReprojectionErrorApplyIntrinsics {
-  OpenCVReprojectionErrorApplyIntrinsics(
+struct ReprojectionErrorApplyIntrinsics {
+  ReprojectionErrorApplyIntrinsics(
       const CameraIntrinsics *invariant_intrinsics,
       const double observed_distorted_x,
       const double observed_distorted_y,
@@ -421,7 +421,7 @@ void AddResidualBlockToProblem(const CameraIntrinsics *invariant_intrinsics,
                                double *camera_R_t,
                                EuclideanPoint *point,
                                ceres::Problem* problem) {
-  AddResidualBlockToProblemImpl<OpenCVReprojectionErrorApplyIntrinsics>(
+  AddResidualBlockToProblemImpl<ReprojectionErrorApplyIntrinsics>(
       invariant_intrinsics,
       marker.x, marker.y,
       marker_weight,



More information about the Bf-blender-cvs mailing list