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

2026-07-30 07:43:03 +04:00 · 2018-10-02 03:21:47 +00:00
parent ae4c72a153 ee0c985491
commit 690fb0544c
22 changed files with 182 additions and 68 deletions
@@ -137,7 +137,11 @@ public:

 /** @brief Abstract base class for 2D image feature detectors and descriptor extractors
 */
+#ifdef __EMSCRIPTEN__
+class CV_EXPORTS_W Feature2D : public Algorithm
+#else
 class CV_EXPORTS_W Feature2D : public virtual Algorithm
+#endif
 {
 public:
    virtual ~Feature2D();