From 1895aff5ef1fd2d37c346ac726dea4c5368f6c79 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 3 Jul 2019 03:02:54 +0200 Subject: [PATCH 1/2] Keep page number in refine_recursive --- src/lib/subpattern.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/subpattern.cpp b/src/lib/subpattern.cpp index c6f533f..1fbebfd 100644 --- a/src/lib/subpattern.cpp +++ b/src/lib/subpattern.cpp @@ -1566,7 +1566,7 @@ void hdmarker_subpattern_step(Mat &img, vector corners, vector & 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 { From de9e79fb1919bda04eca997e5999667c9c8d2c21 Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 5 Jul 2019 22:32:18 +0200 Subject: [PATCH 2/2] Fix page number of submarkers at the fringe --- src/lib/subpattern.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/subpattern.cpp b/src/lib/subpattern.cpp index 1fbebfd..b945833 100644 --- a/src/lib/subpattern.cpp +++ b/src/lib/subpattern.cpp @@ -1106,6 +1106,11 @@ int hdmarker_subpattern_checkneighbours_pers(Mat &img, const vector corn IntCMap corners_map; IntCMap corners_out_map; + + int page = 0; + if (!corners.empty()) { + page = corners.front().page; + } for(int i=0;i 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); }