ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2026-01-03 23:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging with master.

Browse Source
This commit is contained in:
Tadas Baltrusaitis
2018-11-28 20:42:18 +00:00
parent c179c1a790 be9b57703c
commit ae1a8d038f
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -7,9 +7,6 @@ branches:
only:
- master
- develop
- feature/code_cleanup
- feature/parallel_for
- feature/openblas_update
compiler:
- gcc

3
appveyor.yml
View File

@@ -3,9 +3,6 @@ branches:
only:
- develop
- master
- feature/code_cleanup
- feature/parallel_for
- feature/openblas_update
max_jobs: 4
configuration:
- Release

6
lib/local/LandmarkDetector/src/Patch_experts.cpp
View File

@@ -239,9 +239,9 @@ void Patch_experts::Response(vector<cv::Mat_<float> >& patch_expert_responses, c
cv::Mat sim = (cv::Mat_<float>(2, 3) << a1, -b1, landmark_locations.at<float>(ind, 0) - a1 * (area_of_interest_width - 1.0f) / 2.0f + b1 * (area_of_interest_width - 1.0f) / 2.0f, b1, a1, landmark_locations.at<float>(ind + n, 0) - a1 * (area_of_interest_width - 1.0f) / 2.0f - b1 * (area_of_interest_width - 1.0f) / 2.0f);
// Extract the region of interest around the current landmark location
cv::Mat_<float> area_of_interest(area_of_interest_height, area_of_interest_width, 0.0f);
cv::Mat_<float> area_of_interest(area_of_interest_height, area_of_interest_width, 0.0f);
cv::warpAffine(grayscale_image, area_of_interest, sim, area_of_interest.size(), cv::WARP_INVERSE_MAP + cv::INTER_LINEAR);
cv::warpAffine(grayscale_image, area_of_interest, sim, area_of_interest.size(), cv::WARP_INVERSE_MAP + cv::INTER_LINEAR);
// Get intensity response either from the SVR, CCNF, or CEN patch experts (prefer CEN as they are the most accurate so far)
if (!cen_expert_intensity.empty())
@@ -275,7 +275,7 @@ void Patch_experts::Response(vector<cv::Mat_<float> >& patch_expert_responses, c
// Extract the region of interest around the current landmark location
cv::Mat_<float> area_of_interest_r(area_of_interest_height, area_of_interest_width, 0.0f);
cv::warpAffine(grayscale_image, area_of_interest_r, sim_r, area_of_interest_r.size(), cv::WARP_INVERSE_MAP + cv::INTER_LINEAR);
cv::warpAffine(grayscale_image, area_of_interest_r, sim_r, area_of_interest_r.size(), cv::WARP_INVERSE_MAP + cv::INTER_LINEAR);
cv::Mat_<float> prealloc_mat_right = preallocated_im2col[mirror_id][im2col_size];