Merge pull request opencv#11065 from vasiliev-vb:BUGFIX_KAZE_orientation

alalek · alalek · commit cc06935a1031 · 2018-03-14T14:15:47.000Z
diff --git a/modules/features2d/src/kaze/KAZEFeatures.cpp b/modules/features2d/src/kaze/KAZEFeatures.cpp
@@ -606,7 +606,7 @@ void KAZEFeatures::Compute_Main_Orientation(KeyPoint &kpt, const std::vector<TEv
                     resY[idx] = 0.0;
                 }
 
-                Ang[idx] = fastAtan2(resX[idx], resY[idx]) * (float)(CV_PI / 180.0f);
+                Ang[idx] = fastAtan2(resY[idx], resX[idx]) * (float)(CV_PI / 180.0f);
                 ++idx;
             }
         }
@@ -638,7 +638,7 @@ void KAZEFeatures::Compute_Main_Orientation(KeyPoint &kpt, const std::vector<TEv
         if (sumX*sumX + sumY*sumY > max) {
             // store largest orientation
             max = sumX*sumX + sumY*sumY;
-            kpt.angle = fastAtan2(sumX, sumY);
+            kpt.angle = fastAtan2(sumY, sumX);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ void KAZEFeatures::Compute_Main_Orientation(KeyPoint &kpt, const std::vector<TEv`
`606`	`606`	`resY[idx] = 0.0;`
`607`	`607`	`}`
`608`	`608`
`609`		`- Ang[idx] = fastAtan2(resX[idx], resY[idx]) * (float)(CV_PI / 180.0f);`
	`609`	`+ Ang[idx] = fastAtan2(resY[idx], resX[idx]) * (float)(CV_PI / 180.0f);`
`610`	`610`	`++idx;`
`611`	`611`	`}`
`612`	`612`	`}`
`@@ -638,7 +638,7 @@ void KAZEFeatures::Compute_Main_Orientation(KeyPoint &kpt, const std::vector<TEv`
`638`	`638`	`if (sumXsumX + sumYsumY > max) {`
`639`	`639`	`// store largest orientation`
`640`	`640`	`max = sumXsumX + sumYsumY;`
`641`		`- kpt.angle = fastAtan2(sumX, sumY);`
	`641`	`+ kpt.angle = fastAtan2(sumY, sumX);`
`642`	`642`	`}`
`643`	`643`	`}`
`644`	`644`	`}`