1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2019-09-05 14:28:07 +03:00
165 changed files with 1601 additions and 369 deletions
@@ -80,6 +80,10 @@ This section describes approaches based on local 2D features and used to categor
- (Python) An example using the features2D framework to perform object categorization can be
found at opencv_source_code/samples/python/find_obj.py
@defgroup feature2d_hal Hardware Acceleration Layer
@{
@defgroup features2d_hal_interface Interface
@}
@}
*/
@@ -2,7 +2,7 @@
#define OPENCV_FEATURE2D_HAL_INTERFACE_H
#include "opencv2/core/cvdef.h"
//! @addtogroup featrure2d_hal_interface
//! @addtogroup features2d_hal_interface
//! @{
//! @name Fast feature detector types