feature2d: do not compute keypoints orientation twice

hrnr · hrnr · commit c97efd311e93 · 2017-06-15T15:59:42.000+02:00
* always compute keypoints orientation, when computing keypoints
* do not recompute keypoint orientation when computing descriptors

this allows to test detection and extraction separately
diff --git a/modules/features2d/src/akaze.cpp b/modules/features2d/src/akaze.cpp
@@ -200,8 +200,7 @@ namespace cv
             if (!useProvidedKeypoints)
             {
                 impl.Feature_Detection(keypoints);
-                if( !descriptors.needed() )
-                    impl.Compute_Keypoints_Orientation(keypoints);
+                impl.Compute_Keypoints_Orientation(keypoints);
             }
 
             if (!mask.empty())
diff --git a/modules/features2d/src/kaze/AKAZEFeatures.cpp b/modules/features2d/src/kaze/AKAZEFeatures.cpp
@@ -549,7 +549,6 @@ class MSURF_Descriptor_64_Invoker : public ParallelLoopBody
   {
     for (int i = range.start; i < range.end; i++)
     {
-      AKAZEFeatures::Compute_Main_Orientation((*keypoints_)[i], *evolution_);
       Get_MSURF_Descriptor_64((*keypoints_)[i], descriptors_->ptr<float>(i));
     }
   }
@@ -643,7 +642,6 @@ class MLDB_Full_Descriptor_Invoker : public ParallelLoopBody
   {
     for (int i = range.start; i < range.end; i++)
     {
-      AKAZEFeatures::Compute_Main_Orientation((*keypoints_)[i], *evolution_);
       Get_MLDB_Full_Descriptor((*keypoints_)[i], descriptors_->ptr<unsigned char>(i));
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -200,8 +200,7 @@ namespace cv`
`200`	`200`	`if (!useProvidedKeypoints)`
`201`	`201`	`{`
`202`	`202`	`impl.Feature_Detection(keypoints);`
`203`		`- if( !descriptors.needed() )`
`204`		`- impl.Compute_Keypoints_Orientation(keypoints);`
	`203`	`+ impl.Compute_Keypoints_Orientation(keypoints);`
`205`	`204`	`}`
`206`	`205`
`207`	`206`	`if (!mask.empty())`
Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,6 @@ class MSURF_Descriptor_64_Invoker : public ParallelLoopBody`
`549`	`549`	`{`
`550`	`550`	`for (int i = range.start; i < range.end; i++)`
`551`	`551`	`{`
`552`		`- AKAZEFeatures::Compute_Main_Orientation((keypoints_)[i], evolution_);`
`553`	`552`	`Get_MSURF_Descriptor_64((*keypoints_)[i], descriptors_->ptr<float>(i));`
`554`	`553`	`}`
`555`	`554`	`}`
`@@ -643,7 +642,6 @@ class MLDB_Full_Descriptor_Invoker : public ParallelLoopBody`
`643`	`642`	`{`
`644`	`643`	`for (int i = range.start; i < range.end; i++)`
`645`	`644`	`{`
`646`		`- AKAZEFeatures::Compute_Main_Orientation((keypoints_)[i], evolution_);`
`647`	`645`	`Get_MLDB_Full_Descriptor((*keypoints_)[i], descriptors_->ptr<unsigned char>(i));`
`648`	`646`	`}`
`649`	`647`	`}`