mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: fix js build (make video->calib3d dependency optional)

Browse Source 
- estimateRigidTransform() is excluded from JS bindings
This commit is contained in:
Alexander Alekhin 2018-08-31 14:26:36 +03:00
parent 90f47eb952
commit fcfa488250
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/js/src/embindgen.py
View File

@ -120,7 +120,7 @@ objdetect = {'': ['groupRectangles'],
'HOGDescriptor': ['load', 'HOGDescriptor', 'getDefaultPeopleDetector', 'getDaimlerPeopleDetector', 'setSVMDetector', 'detectMultiScale'], 'HOGDescriptor': ['load', 'HOGDescriptor', 'getDefaultPeopleDetector', 'getDaimlerPeopleDetector', 'setSVMDetector', 'detectMultiScale'],
'CascadeClassifier': ['load', 'detectMultiScale2', 'CascadeClassifier', 'detectMultiScale3', 'empty', 'detectMultiScale']} 'CascadeClassifier': ['load', 'detectMultiScale2', 'CascadeClassifier', 'detectMultiScale3', 'empty', 'detectMultiScale']}
video = {'': ['CamShift', 'calcOpticalFlowFarneback', 'calcOpticalFlowPyrLK', 'createBackgroundSubtractorMOG2', 'estimateRigidTransform',\ video = {'': ['CamShift', 'calcOpticalFlowFarneback', 'calcOpticalFlowPyrLK', 'createBackgroundSubtractorMOG2', \
'findTransformECC', 'meanShift'], 'findTransformECC', 'meanShift'],
'BackgroundSubtractorMOG2': ['BackgroundSubtractorMOG2', 'apply'], 'BackgroundSubtractorMOG2': ['BackgroundSubtractorMOG2', 'apply'],
'BackgroundSubtractor': ['apply', 'getBackgroundImage']} 'BackgroundSubtractor': ['apply', 'getBackgroundImage']}

2
modules/video/CMakeLists.txt
View File

@ -1,2 +1,2 @@
set(the_description "Video Analysis") set(the_description "Video Analysis")
ocv_define_module(video opencv_imgproc opencv_calib3d WRAP java python js) ocv_define_module(video opencv_imgproc OPTIONAL opencv_calib3d WRAP java python js)

11
modules/video/src/lkpyramid.cpp
View File

@ -45,7 +45,9 @@
#include "lkpyramid.hpp" #include "lkpyramid.hpp"
#include "opencl_kernels_video.hpp" #include "opencl_kernels_video.hpp"
#include "opencv2/core/hal/intrin.hpp" #include "opencv2/core/hal/intrin.hpp"
#ifdef HAVE_OPENCV_CALIB3D
#include "opencv2/calib3d.hpp" #include "opencv2/calib3d.hpp"
#endif
#include "opencv2/core/openvx/ovx_defs.hpp" #include "opencv2/core/openvx/ovx_defs.hpp"
@ -1402,7 +1404,10 @@ void cv::calcOpticalFlowPyrLK( InputArray _prevImg, InputArray _nextImg,
cv::Mat cv::estimateRigidTransform( InputArray src1, InputArray src2, bool fullAffine ) cv::Mat cv::estimateRigidTransform( InputArray src1, InputArray src2, bool fullAffine )
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
#ifndef HAVE_OPENCV_CALIB3D
CV_UNUSED(src1); CV_UNUSED(src2); CV_UNUSED(fullAffine);
CV_Error(Error::StsError, "estimateRigidTransform requires calib3d module");
#else
Mat A = src1.getMat(), B = src2.getMat(); Mat A = src1.getMat(), B = src2.getMat();
const int COUNT = 15; const int COUNT = 15;
@ -1505,8 +1510,10 @@ cv::Mat cv::estimateRigidTransform( InputArray src1, InputArray src2, bool fullA
if (fullAffine) if (fullAffine)
{ {
return estimateAffine2D(pA, pB); return estimateAffine2D(pA, pB);
} else }
else
{ {
return estimateAffinePartial2D(pA, pB); return estimateAffinePartial2D(pA, pB);
} }
#endif
} }

2
platforms/js/build_js.py
View File

@ -129,7 +129,7 @@ class Builder:
"-DWITH_ITT=OFF", "-DWITH_ITT=OFF",
"-DBUILD_ZLIB=ON", "-DBUILD_ZLIB=ON",
"-DBUILD_opencv_apps=OFF", "-DBUILD_opencv_apps=OFF",
"-DBUILD_opencv_calib3d=OFF", "-DBUILD_opencv_calib3d=ON",
"-DBUILD_opencv_dnn=ON", "-DBUILD_opencv_dnn=ON",
"-DBUILD_opencv_features2d=OFF", "-DBUILD_opencv_features2d=OFF",
"-DBUILD_opencv_flann=OFF", "-DBUILD_opencv_flann=OFF",