Skip to content

Keep page number in refine_recursive #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abrock wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Keep page number in refine_recursive #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1895aff
Keep page number in refine_recursive
abrock Jul 3, 2019
de9e79f
Fix page number of submarkers at the fringe
abrock Jul 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/lib/subpattern.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,6 +1106,11 @@ int hdmarker_subpattern_checkneighbours_pers(Mat &img, const vector<Corner> corn

IntCMap corners_map;
IntCMap corners_out_map;

int page = 0;
if (!corners.empty()) {
page = corners.front().page;
}

for(int i=0;i<corners.size();i++) {
Corner c = corners[i];
Expand Down Expand Up @@ -1354,7 +1359,7 @@ int hdmarker_subpattern_checkneighbours_pers(Mat &img, const vector<Corner> corn
//FIXME push all corners from corners_out_map
//corners_out.push_back(c_o);
for(auto it=corners_out_map.begin();it!=corners_out_map.end();++it) {
Corner c_o(it->second.p, it->second.id, 0);
Corner c_o(it->second.p, it->second.id, page);
c_o.size = it->second.size;
corners_out.push_back(c_o);
}
Expand Down Expand Up @@ -1566,7 +1571,7 @@ void hdmarker_subpattern_step(Mat &img, vector<Corner> corners, vector<Corner> &
putText(*paint, buf, refine_p+Point2f(0,7), FONT_HERSHEY_SIMPLEX, 0.3, CV_RGB(127,127,127));*/
}

Corner c_o(refine_p, Point2i(c.id.x*out_idx_scale+2*x+out_idx_offset, c.id.y*out_idx_scale+2*y+out_idx_offset), 0);
Corner c_o(refine_p, Point2i(c.id.x*out_idx_scale+2*x+out_idx_offset, c.id.y*out_idx_scale+2*y+out_idx_offset), c.page);
c_o.size = len*0.2;
#pragma omp critical
{
Expand Down