Merge pull request #19856 from danielenricocahall:remove-freatures2d-virtual-inheritance

4 years ago · c105402dfc
parent fc628014bb 4e691587ef
commit c105402dfc
1 changed files with 0 additions and 4 deletions
--- a/modules/features2d/include/opencv2/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d.hpp
@ -141,11 +141,7 @@ 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();