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

modules/js/src/core_bindings.cpp

@@ -289,13 +289,16 @@ namespace binding_utils
         float radius;
     };
 
+#ifdef HAVE_OPENCV_IMGPROC
     Circle minEnclosingCircle(const cv::Mat& points)
     {
         Circle circle;
         cv::minEnclosingCircle(points, circle.center, circle.radius);
         return circle;
     }
+#endif
 
+#ifdef HAVE_OPENCV_VIDEO
     emscripten::val CamShiftWrapper(const cv::Mat& arg1, Rect& arg2, TermCriteria arg3)
     {
         RotatedRect rotatedRect = cv::CamShift(arg1, arg2, arg3);
@@ -313,6 +316,7 @@ namespace binding_utils
         result.call<void>("push", arg2);
         return result;
     }
+#endif  // HAVE_OPENCV_VIDEO
 
     std::string getExceptionMsg(const cv::Exception& e) {
         return e.msg;
@@ -551,19 +555,25 @@ EMSCRIPTEN_BINDINGS(binding_utils)
 
     function("exceptionFromPtr", &binding_utils::exceptionFromPtr, allow_raw_pointers());
 
+#ifdef HAVE_OPENCV_IMGPROC
     function("minEnclosingCircle", select_overload<binding_utils::Circle(const cv::Mat&)>(&binding_utils::minEnclosingCircle));
+#endif
 
     function("minMaxLoc", select_overload<binding_utils::MinMaxLoc(const cv::Mat&, const cv::Mat&)>(&binding_utils::minMaxLoc));
 
     function("minMaxLoc", select_overload<binding_utils::MinMaxLoc(const cv::Mat&)>(&binding_utils::minMaxLoc_1));
 
+#ifdef HAVE_OPENCV_IMGPROC
     function("morphologyDefaultBorderValue", &cv::morphologyDefaultBorderValue);
+#endif
 
     function("CV_MAT_DEPTH", &binding_utils::cvMatDepth);
 
+#ifdef HAVE_OPENCV_VIDEO
     function("CamShift", select_overload<emscripten::val(const cv::Mat&, Rect&, TermCriteria)>(&binding_utils::CamShiftWrapper));
 
     function("meanShift", select_overload<emscripten::val(const cv::Mat&, Rect&, TermCriteria)>(&binding_utils::meanShiftWrapper));
+#endif
 
     function("getBuildInformation", &binding_utils::getBuildInformation);
 

modules/js/src/embindgen.py

@@ -140,7 +140,7 @@ features2d = {'Feature2D': ['detect', 'compute', 'detectAndCompute', 'descriptor
               'AKAZE': ['create', 'setDescriptorType', 'getDescriptorType', 'setDescriptorSize', 'getDescriptorSize', 'setDescriptorChannels', 'getDescriptorChannels', 'setThreshold', 'getThreshold', 'setNOctaves', 'getNOctaves', 'setNOctaveLayers', 'getNOctaveLayers', 'setDiffusivity', 'getDiffusivity', 'getDefaultName'],
               'DescriptorMatcher': ['add', 'clear', 'empty', 'isMaskSupported', 'train', 'match', 'knnMatch', 'radiusMatch', 'clone', 'create'],
               'BFMatcher': ['isMaskSupported', 'create'],
-              '': ['FAST', 'AGAST', 'drawKeypoints', 'drawMatches']}
+              '': ['drawKeypoints', 'drawMatches']}
 
 photo = {'': ['createAlignMTB', 'createCalibrateDebevec', 'createCalibrateRobertson', \
               'createMergeDebevec', 'createMergeMertens', 'createMergeRobertson', \

modules/js/test/test_features2d.js

@@ -0,0 +1,82 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+if (typeof module !== 'undefined' && module.exports) {
+    // The envrionment is Node.js
+    var cv = require('./opencv.js'); // eslint-disable-line no-var
+}
+
+function generateTestFrame(width, height) {
+  let w = width || 200;
+  let h = height || 200;
+  let img = new cv.Mat(h, w, cv.CV_8UC1, new cv.Scalar(0, 0, 0, 0));
+  let s = new cv.Scalar(255, 255, 255, 255);
+  let s128 = new cv.Scalar(128, 128, 128, 128);
+  let rect = new cv.Rect(w / 4, h / 4, w / 2, h / 2);
+  img.roi(rect).setTo(s);
+  img.roi(new cv.Rect(w / 2 - w / 8, h / 2 - h / 8, w / 4, h / 4)).setTo(s128);
+  cv.rectangle(img, new cv.Point(w / 8, h / 8), new cv.Point(w - w / 8, h - h / 8), s, 5);
+  cv.rectangle(img, new cv.Point(w / 5, h / 5), new cv.Point(w - w / 5, h - h / 5), s128, 3);
+  cv.line(img, new cv.Point(-w, 0), new cv.Point(w / 2, h / 2), s128, 5);
+  cv.line(img, new cv.Point(2*w, 0), new cv.Point(w / 2, h / 2), s, 5);
+  return img;
+}
+
+QUnit.module('Features2D', {});
+QUnit.test('Detectors', function(assert) {
+  let image = generateTestFrame();
+
+  let kp = new cv.KeyPointVector();
+
+  let orb = new cv.ORB();
+  orb.detect(image, kp);
+  assert.equal(kp.size(), 67, 'ORB');
+
+  let mser = new cv.MSER();
+  mser.detect(image, kp);
+  assert.equal(kp.size(), 7, 'MSER');
+
+  let brisk = new cv.BRISK();
+  brisk.detect(image, kp);
+  assert.equal(kp.size(), 191, 'BRISK');
+
+  let ffd = new cv.FastFeatureDetector();
+  ffd.detect(image, kp);
+  assert.equal(kp.size(), 12, 'FastFeatureDetector');
+
+  let afd = new cv.AgastFeatureDetector();
+  afd.detect(image, kp);
+  assert.equal(kp.size(), 67, 'AgastFeatureDetector');
+
+  let gftt = new cv.GFTTDetector();
+  gftt.detect(image, kp);
+  assert.equal(kp.size(), 168, 'GFTTDetector');
+
+  let kaze = new cv.KAZE();
+  kaze.detect(image, kp);
+  assert.equal(kp.size(), 159, 'KAZE');
+
+  let akaze = new cv.AKAZE();
+  akaze.detect(image, kp);
+  assert.equal(kp.size(), 52, 'AKAZE');
+});
+
+QUnit.test('BFMatcher', function(assert) {
+  // Generate key points.
+  let image = generateTestFrame();
+
+  let kp = new cv.KeyPointVector();
+  let descriptors = new cv.Mat();
+  let orb = new cv.ORB();
+  orb.detectAndCompute(image, new cv.Mat(), kp, descriptors);
+
+  assert.equal(kp.size(), 67);
+
+  // Run a matcher.
+  let dm = new cv.DMatchVector();
+  let matcher = new cv.BFMatcher();
+  matcher.match(descriptors, descriptors, dm);
+
+  assert.equal(dm.size(), 67);
+});

modules/js/test/tests.html

@@ -29,6 +29,7 @@
         <script type="application/javascript" src="test_objdetect.js"></script>
         <script type="application/javascript" src="test_video.js"></script>
         <script type="application/javascript" src="test_photo.js"></script>
+        <script type="application/javascript" src="test_features2d.js"></script>
         <script  type='text/javascript'>
             QUnit.config.autostart = false;
 
@@ -69,11 +70,5 @@
             };
           };
         </script>
-
-<!--
-    TODO
-    <script type="application/javascript" src="test_features2d.js"></script>
--->
-
     </body>
 </html>

modules/js/test/tests.js

@@ -45,7 +45,8 @@ testrunner.run(
     {
         code: 'opencv.js',
         tests: ['test_mat.js', 'test_utils.js', 'test_imgproc.js',
-                'test_objdetect.js', 'test_video.js', 'test_photo.js'],
+                'test_objdetect.js', 'test_video.js', 'test_features2d.js',
+                'test_photo.js'],
     },
     function(err, report) {
         console.log(report.failed + ' failed, ' + report.passed + ' passed');