Merge pull request #2074 from bitsun:master

bitsun · alalek · commit c7f2e2a2bbdd · 2019-04-16T17:52:37.000+03:00
* fix rectifyPatch bug when patch orientation is not extracted
diff --git a/modules/xfeatures2d/src/boostdesc.cpp b/modules/xfeatures2d/src/boostdesc.cpp
@@ -364,9 +364,10 @@ static void rectifyPatch( const Mat& image, const KeyPoint& kp,
     }
     else
     {
-      float M_[] = {
-          1.f,  0.f, -1.f * patchSize/2.0f + kp.pt.x,
-          0.f,  1.f, -1.f * patchSize/2.0f + kp.pt.y
+        const float s = scale_factor * (float)kp.size / (float)patchSize;
+        float M_[] = {
+          s,  0.f, -s * patchSize/2.0f + kp.pt.x,
+          0.f,  s, -s * patchSize/2.0f + kp.pt.y
       };
       M = Mat( 2, 3, CV_32FC1, M_ ).clone();
     }

Original file line number	Diff line number	Diff line change
`@@ -364,9 +364,10 @@ static void rectifyPatch( const Mat& image, const KeyPoint& kp,`
`364`	`364`	`}`
`365`	`365`	`else`
`366`	`366`	`{`
`367`		`- float M_[] = {`
`368`		`- 1.f, 0.f, -1.f * patchSize/2.0f + kp.pt.x,`
`369`		`- 0.f, 1.f, -1.f * patchSize/2.0f + kp.pt.y`
	`367`	`+ const float s = scale_factor * (float)kp.size / (float)patchSize;`
	`368`	`+ float M_[] = {`
	`369`	`+ s, 0.f, -s * patchSize/2.0f + kp.pt.x,`
	`370`	`+ 0.f, s, -s * patchSize/2.0f + kp.pt.y`
`370`	`371`	`};`
`371`	`372`	`M = Mat( 2, 3, CV_32FC1, M_ ).clone();`
`372`	`373`	`}`