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

pull/19902/head
Alexander Alekhin 4 years ago
commit c105402dfc
  1. 4
      modules/features2d/include/opencv2/features2d.hpp

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

Loading…
Cancel
Save