diff --git a/.travis.yml b/.travis.yml index 4007939c..200c5e90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,6 @@ branches: only: - master - develop - - feature/code_cleanup - - feature/parallel_for - - feature/openblas_update compiler: - gcc diff --git a/appveyor.yml b/appveyor.yml index bfb3d529..539e3164 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,9 +3,6 @@ branches: only: - develop - master - - feature/code_cleanup - - feature/parallel_for - - feature/openblas_update max_jobs: 4 configuration: - Release diff --git a/lib/local/LandmarkDetector/src/Patch_experts.cpp b/lib/local/LandmarkDetector/src/Patch_experts.cpp index f7c90734..58ee67e4 100644 --- a/lib/local/LandmarkDetector/src/Patch_experts.cpp +++ b/lib/local/LandmarkDetector/src/Patch_experts.cpp @@ -239,9 +239,9 @@ void Patch_experts::Response(vector >& patch_expert_responses, c cv::Mat sim = (cv::Mat_(2, 3) << a1, -b1, landmark_locations.at(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(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_ area_of_interest(area_of_interest_height, area_of_interest_width, 0.0f); + cv::Mat_ 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 >& patch_expert_responses, c // Extract the region of interest around the current landmark location cv::Mat_ 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_ prealloc_mat_right = preallocated_im2col[mirror_id][im2col_size];