cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[face_geometry] [change] RET_CHECK_EQ -> RET_CHECK_GE

Browse Source
This commit is contained in:
lilinxiong 2021-12-31 11:36:10 +08:00
parent e6c19885c6
commit 4cc4740d72
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mediapipe/modules/face_geometry/libs/geometry_pipeline.cc
View File

@ -124,12 +124,15 @@ class ScreenToMetricSpaceConverter {
const PerspectiveCameraFrustum& pcf, // const PerspectiveCameraFrustum& pcf, //
LandmarkList& metric_landmark_list, // LandmarkList& metric_landmark_list, //
Eigen::Matrix4f& pose_transform_mat) const { Eigen::Matrix4f& pose_transform_mat) const {
RET_CHECK_EQ(screen_landmark_list.landmark_size(), RET_CHECK_GE(screen_landmark_list.landmark_size(),
canonical_metric_landmarks_.cols()) canonical_metric_landmarks_.cols())
<< "The number of landmarks doesn't match the number passed upon " << "The number of landmarks doesn't match the number passed upon landmark_size: "
"initialization!"; << screen_landmark_list.landmark_size()
<< " canonical_metric_landmarks_.cols: "
<< canonical_metric_landmarks_.cols()
<< " initialization!";
Eigen::Matrix3Xf screen_landmarks; Eigen::Matrix3Xf screen_landmarks = Eigen::Matrix3Xf(3, canonical_metric_landmarks_.cols());
ConvertLandmarkListToEigenMatrix(screen_landmark_list, screen_landmarks); ConvertLandmarkListToEigenMatrix(screen_landmark_list, screen_landmarks);
ProjectXY(pcf, screen_landmarks); ProjectXY(pcf, screen_landmarks);
@ -260,8 +263,7 @@ class ScreenToMetricSpaceConverter {
static void ConvertLandmarkListToEigenMatrix( static void ConvertLandmarkListToEigenMatrix(
const NormalizedLandmarkList& landmark_list, const NormalizedLandmarkList& landmark_list,
Eigen::Matrix3Xf& eigen_matrix) { Eigen::Matrix3Xf& eigen_matrix) {
eigen_matrix = Eigen::Matrix3Xf(3, landmark_list.landmark_size()); for (int i = 0; i < eigen_matrix.cols(); ++i) {
for (int i = 0; i < landmark_list.landmark_size(); ++i) {
const auto& landmark = landmark_list.landmark(i); const auto& landmark = landmark_list.landmark(i);
eigen_matrix(0, i) = landmark.x(); eigen_matrix(0, i) = landmark.x();
eigen_matrix(1, i) = landmark.y(); eigen_matrix(1, i) = landmark.y();