mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 14:29:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
30,001 Commits 6 Branches 126 Tags 3 GiB
050327a1e2
Commit Graph

3200 Commits

Author SHA1 Message Date
smirnov-alexey
7b7d21ebef Updates gapi tutorial using normalize kernel 
Changes doc, images and sample code itself
 2019-02-15 14:13:42 +03:00
Alexander Alekhin
f414c16c13 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-02-08 17:18:56 +00:00
Dmitry Kurtaev
6ad3bf3130 Enable ResNet-based Mask-RCNN models from TensorFlow Object Detection API 2019-02-06 13:05:11 +03:00
Alexander Alekhin
fcec053d59 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-02-05 19:12:41 +03:00
Alexander Alekhin
f46cd9dbf5 Merge pull request #13670 from allnes:dnn_fix_obj_detect_sample 2019-02-05 12:37:53 +00:00
Alexander Alekhin
665408e57f Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-02-01 13:17:32 +03:00
Dmitry Kurtaev
252fd63194 Align TensorFlow and OpenCV paths to create a text graph 2019-01-31 13:40:54 +03:00
Alexander Nesterov
cca2c4b314 Update obj. detect sample 2019-01-30 16:44:42 -01:00
Alexander Alekhin
631b246881 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-01-22 18:00:34 +00:00
Alexander Alekhin
e5917a8fa5 Merge pull request #13580 from LaurentBerger:PythonStitch2 2019-01-19 13:44:30 +00:00
LaurentBerger
49a43dfc8f Check syntax of stitchnig detailed 2019-01-18 19:31:05 +01:00
Dmitry Kurtaev
67e6a6077d Create text graphs for Faster-RCNN from TensorFlow with dilated convolutions 2019-01-18 18:46:52 +03:00
Alexander Alekhin
bbc6b95c02 Merge pull request #13644 from berak:dnn_samples_googlenet 2019-01-17 12:34:53 +00:00
berak
6596eab66c dnn/samples: add googlenet to model zoo 2019-01-17 12:14:35 +01:00
Alexander Alekhin
6e39856623 Merge pull request #13614 from dkurt:dnn_tf_ssd_fpn 2019-01-13 09:33:05 +00:00
Dmitry Kurtaev
4ae5df5509 SSD with FPN proposals from TensorFlow 2019-01-11 12:20:03 +03:00
Alexander Alekhin
7e2ebecd52 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-01-10 12:29:41 +03:00
Quentin Chateau
581d0ef8a9 Merge pull request #13584 from qchateau:improve_stitching_detailed 
Improve stitching detailed (#13584)

* Added block size getter/setters

* Added a bunch of new features to the stitching_detailed sample

* Do not required XFEATURES2D for default use

* Add support for akaze features in stitching_detailed

* Improved sample logs
 2019-01-09 17:01:07 +03:00
Dmitry Kurtaev
62199df815 Fix edge_detection.py sample for Python 3 2019-01-09 15:28:10 +03:00
Alexander Alekhin
85ade61ef7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-12-27 18:15:50 +03:00
Alexander Nesterov
a208c3bf04 Fix openpose samples 2018-12-25 14:12:44 -01:00
Alexander Alekhin
578ea4bae9 Merge pull request #13386 from alalek:android_gradle 2018-12-21 13:56:03 +00:00
Alexander Alekhin
2b35c1708b android: gradle-based package and samples 
- drop hello-android sample
 2018-12-19 14:59:48 +03:00
Alexander Alekhin
e093a19c70 Merge pull request #13471 from dkurt:fix_enum_struct_java 2018-12-19 11:53:41 +00:00
Dmitry Kurtaev
6fbcb283b9 Try to fix "enum struct" wrapping for Java 2018-12-19 13:16:43 +03:00
Alexander Alekhin
7fb70e1701 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-12-18 19:07:43 +00:00
LaurentBerger
2fb409b286 Merge pull request #13267 from LaurentBerger:StitchPython 
* Python wrapper for detail

* hide pyrotationwrapper

* copy code in pyopencv_rotationwarper.hpp

* move ImageFeatures MatchInfo and CameraParams in core/misc/

* add python test for detail

* move test_detail in test_stitching

* rename
 2018-12-18 21:49:16 +03:00
vishwesh5
715f8fcce0 Merge pull request #13432 from vishwesh5:patch-1 
* Create text_detection.py

#12270 #13429
**Deep Learning text detection sample (Python)**
- Tested on **Ubuntu 18.04** - OpenCV 3.4.3, OpenCV 3.4.4, OpenCV 4.0 (master branch)
- Python version supported - Python 2 and Python 3

* Fix trailing whitespaces

* Update text_detection.py

* Remove whitespace

* Remove comments

* Remove unused packages

* Update description
 2018-12-18 13:40:04 +03:00
Alexander Alekhin
e82e672a93 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-12-06 07:06:58 +00:00
Alexander Alekhin
742f22c09b photo: move TonemapDurand to opencv_contrib 2018-12-04 18:59:27 +03:00
Alexander Alekhin
c0016d7fe9
Merge pull request #13253 from alalek:fix_13201 
* cmake: install 'legacy/constants_c.h' files

* samples: add compatibility test code
 2018-11-23 20:02:46 +03:00
Alexander Alekhin
7fa7fa0226 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-21 08:33:39 +00:00
Alexander Alekhin
94d7c0f7f5 Merge pull request #13144 from dkurt:update_tf_mask_rcnn 2018-11-19 15:55:35 +00:00
Alexander Alekhin
22dbcf98c5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-17 14:17:35 +00:00
Alexander Alekhin
73a17baeec samples(run_python): fix registry values querying 2018-11-17 09:42:51 +00:00
Alexander Alekhin
43002c0c1d
Merge pull request #13188 from alalek:samples_rename 
* samples: rename starter_imagelist.cpp

* samples: rename intelperc_capture.cpp => videocapture_intelperc.cpp

* samples: rename openni_capture.cpp => videocapture_openni.cpp

* samples: rename image_sequence.cpp => videocapture_image_sequence.cpp

* samples: rename gstreamer_pipeline.cpp => videocapture_gstreamer_pipeline.cpp

* samples: rename autofocus.cpp => videocapture_gphoto2_autofocus.cpp

* samples: rename live_detect_qrcode.cpp => qrcode.cpp
 2018-11-17 00:35:05 +03:00
Alexander Alekhin
ee417048e5
Merge pull request #13178 from alalek:fix_samples_python_video_params 2018-11-16 22:46:22 +03:00
Alexander Alekhin
a4b21d9e2e
Merge pull request #13177 from alalek:update_win32_scripts 2018-11-16 22:45:57 +03:00
Alexander Alekhin
c371df4aa2 samples: use findFile() in "python" 2018-11-16 18:08:22 +00:00
Alexander Alekhin
9ea8c775f8 samples: use findFile() in T-API samples 2018-11-16 18:08:22 +00:00
Alexander Alekhin
e8e2197032 samples: use findFile() in dnn 2018-11-16 18:08:22 +00:00
Alexander Alekhin
c4c31f5bba samples: use findFile() in "cpp" 2018-11-16 18:08:22 +00:00
Alexander Alekhin
9ca82caeb7 samples(python): fix drive handling in source path 2018-11-16 00:24:34 +00:00
Alexander Alekhin
5cf84c3765 samples: update Python launcher (winpack) 2018-11-15 23:36:26 +00:00
Alexander Alekhin
3d68b5baa1 samples: update build script (winpack) 
- drop EnableDelayedExpansion
 2018-11-15 23:36:26 +00:00
Patrick Cox
6820abd67f samples(python): Updated use of model.load instances 
The load() function returns a new object, and as such does not use the one it is called on.
This commit updates the uses of model.load in this program so it will work as intended and not throw an error.
 2018-11-15 22:14:40 +00:00
Dmitry Matveev
85fad1504a Merge pull request #13030 from dmatveev:tutorial 
* G-API: First steps with tutorial

* G-API Tutorial: First iteration

* G-API port of anisotropic image segmentation tutorial;
* Currently works via OpenCV only;
* Some new kernels have been required.

* G-API Tutorial: added chapters on execution code, inspection, and profiling

* G-API Tutorial: make Fluid kernel headers public

For some reason, these headers were not moved to the public
headers subtree during the initial development. Somehow it even
worked for the existing workloads.

* G-API Tutorial: Fix a couple of issues found during the work

* Introduced Phase & Sqrt kernels, OCV & Fluid versions
* Extended GKernelPackage to allow kernel removal & policies on include()

All the above stuff needs to be tested, tests will be added later

* G-API Tutorial: added chapter on running Fluid backend

* G-API Tutorial: fix a number of issues in the text

* G-API Tutorial - some final updates

- Fixed post-merge issues after Sobel kernel renaming;
- Simplified G-API code a little bit;
- Put a conclusion note in text.

* G-API Tutorial - fix build issues in test/perf targets

Public headers were refactored but tests suites were not updated in time

* G-API Tutorial: Added tests & reference docs on new kernels

* Phase
* Sqrt

* G-API Tutorial: added link to the tutorial from the main module doc

* G-API Tutorial: Added tests on new GKernelPackage functionality

* G-API Tutorial: Extended InRange tests to cover 32F

* G-API Tutorial: Misc fixes

* Avoid building examples when gapi module is not there
* Added a volatile API disclaimer to G-API root documentation page

* G-API Tutorial: Fix perf tests build issue

This change came from master where Fluid kernels are still used
incorrectly.

* G-API Tutorial: Fixed channels support in Sqrt/Phase fluid kernels

Extended tests to cover this case

* G-API Tutorial: Fix text problems found on team review
 2018-11-15 18:12:36 +03:00
Dmitry Kurtaev
1a27ff4518 Update Mask-RCNN networks generator 2018-11-13 13:22:39 +03:00
Alexander Alekhin
1913482cf5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-10 20:50:26 +00:00
Jiri Horner
1ba7c728a6 Merge pull request #12827 from hrnr:stitching_4 
[evolution] Stitching for OpenCV 4.0

* stitching: wrap Stitcher::create for bindings

* provide method for consistent stitcher usage across languages

* samples: add python stitching sample

* port cpp stitching sample to python

* stitching: consolidate Stitcher create methods

* remove Stitcher::createDefault, it returns Stitcher, not Ptr<Stitcher> -> inconsistent API
* deprecate cv::createStitcher and cv::createStitcherScans in favor of Stitcher::create

* stitching: avoid anonymous enum in Stitcher

* ORIG_RESOL should be double
* add documentatiton

* stitching: improve documentation in Stitcher

* stitching: expose estimator in Stitcher

* remove ABI hack

* stitching: drop try_use_gpu flag

* OCL will be used automatically through T-API in OCL-enable paths
* CUDA won't be used unless user sets CUDA-enabled classes manually

* stitching: drop FeaturesFinder

* use Feature2D instead of FeaturesFinder
* interoperability with features2d module
* detach from dependency on xfeatures2d

* features2d: fix compute and detect to work with UMat vectors

* correctly pass UMats as UMats to allow OCL paths
* support vector of UMats as output arg

* stitching: use nearest interpolation for resizing masks

* fix warnings
 2018-11-10 19:53:48 +03:00
Vadim Pisarevsky
82e8657a6d backport: refined QRCodeDetector API for OpenCV 4.0 2018-11-09 22:27:38 +00:00
Alexander Alekhin
8675a8c743 Merge pull request #12878 from tompollok:3.4 2018-11-09 19:54:17 +00:00
Vadim Pisarevsky
96bf26611e Merge pull request #13084 from vpisarev:shuffle_optflow_algos 
* moved DIS optical flow from opencv_contrib to opencv, moved TVL1 from opencv to opencv_contrib

* fixed compile warning

* TVL1 optical flow example moved to opencv_contrib
 2018-11-09 17:52:06 +03:00
Vadim Pisarevsky
8cdf7bb84b
refined QRCodeDetector API for OpenCV 4.0 (#13086) 
* refined QRCodeDetector API for OpenCV 4.0

* expanded and tested QRCodeDetector::detectAndDecode()
 2018-11-09 12:57:27 +03:00
tompollok
2da56d5af6 refactoring catching all exceptions as const ref 2018-11-08 19:59:47 +03:00
Alexander Alekhin
0c261acf3a Merge pull request #13065 from dkurt:dnn_update_tf_faster_rcnn 2018-11-08 16:31:39 +00:00
Alexander Alekhin
4b298a7460 Merge pull request #13076 from berak:fix_digits_video_py 2018-11-08 16:30:41 +00:00
Alexander Alekhin
c1921f1b12
Merge pull request #13069 from alalek:move_viz_contrib 2018-11-08 19:04:31 +03:00
berak
f30eafc9ac samples: fix digits_video.py 2018-11-08 09:17:41 +01:00
Dmitry Kurtaev
dc9e6d3af8 Update a script to generate text graphs for Faster-RCNN networks from TensorFlow 2018-11-07 18:33:01 +03:00
Alexander Alekhin
dadba232de viz: move samples/tutorials to opencv_contrib 2018-11-07 17:11:26 +03:00
Alexander Alekhin
31498ebbea videostab: move sample to opencv_contrib 2018-11-07 15:49:35 +03:00
Alexander Alekhin
05dc645b81 Merge pull request #13025 from alalek:move_shape_contrib 2018-11-07 12:36:30 +00:00
Alexander Alekhin
2c6f1ab57d Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-06 20:04:31 +00:00
Alexander Alekhin
cfb02b5370 shape: move sample to opencv_contrib 2018-11-06 16:52:17 +03:00
Alexander Alekhin
687fa6a8ca Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-02 05:33:35 +00:00
Alexander Alekhin
fc21b15d6e samples(gpu): cleanup samples for legacy API 2018-10-31 23:57:10 +00:00
Alexander Alekhin
2268ed1b6e Merge pull request #12948 from catree:add_drawFrameAxes 2018-10-30 13:33:01 +00:00
catree
4bea70a64a Update background subtraction tutorial with Java and Python codes. 2018-10-26 22:17:18 +02:00
Alexander Alekhin
50bec53afc Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-26 17:56:55 +03:00
Wenfeng CAI
31be03a805 Merge pull request #12772 from xoox:calib-release-object 
More accurate pinhole camera calibration with imperfect planar target (#12772)
43 commits:

* Add derivatives with respect to object points

Add an output parameter to calculate derivatives of image points with
respect to 3D coordinates of object points. The output jacobian matrix
is a 2Nx3N matrix where N is the number of points.

This commit introduces incompatibility to old function signature.

* Set zero for dpdo matrix before using

dpdo is a sparse matrix with only non-zero value close to major
diagonal. Set it to zero because only elements near major diagonal are
computed.

* Add jacobian columns to projectPoints()

The output jacobian matrix of derivatives with respect to coordinates of
3D object points are added. This might break callers who assume the
columns of jacobian matrix.

* Adapt test code to updated project functions

The test cases for projectPoints() and cvProjectPoints2() are updated to
fit new function signatures.

* Add accuracy test code for dpdo

* Add badarg test for dpdo

* Add new enum item for new calibration method

CALIB_RELEASE_OBJECT is used to whether to release 3D coordinates of
object points. The method was proposed in: K. H. Strobl and G. Hirzinger.
"More Accurate Pinhole Camera Calibration with Imperfect Planar Target".
In Proceedings of the IEEE International Conference on Computer Vision
(ICCV 2011), 1st IEEE Workshop on Challenges and Opportunities in Robot
Perception, Barcelona, Spain, pp. 1068-1075, November 2011.

* Add releasing object method into internal function

It's a simple extension of the standard calibration scheme. We choose to
fix the first and last object point and a user-selected fixed point.

* Add interfaces for extended calibration method

* Refine document for calibrateCamera()

When releasing object points, only the z coordinates of the
objectPoints[0].back is fixed.

* Add link to strobl2011iccv paper

* Improve documentation for calibrateCamera()

* Add implementations of wrapping calibrateCamera()

* Add checking for params of new calibration method

If input parameters are not qualified, then fall back to standard
calibration method.

* Add camera calibration method of releasing object

The current implementation is equal to or better than
https://github.com/xoox/calibrel

* Update doc for CALIB_RELEASE_OBJECT

CALIB_USE_QR or CALIB_USE_LU could be used for faster calibration with
potentially less precise and less stable in some rare cases.

* Add RELEASE_OBJECT calibration to tutorial code

To select the calibration method of releasing object points, a command
line parameter `-d=<number>` should be provided.

* Update tutorial doc for camera_calibration

If the method of releasing object points is merged into OpenCV. It will
be expected to be firstly released in 4.1, I think.

* Reduce epsilon for cornerSubPix()

Epsilon of 0.1 is a bigger one. Preciser corner positions are required
with calibration method of releasing object.

* Refine camera calibration tutorial

The hypothesis coordinates are used to indicate which distance must be
measured between two specified object points.

* Update sample calibration code method selection

Similar to camera_calibration tutorial application, a command line
argument `-dt=<number>` is used to select the calibration method.

* Add guard to flags of cvCalibrateCamera2()

cvCalibrateCamera2() doesn't accept CALIB_RELEASE_OBJECT unless overload
interface is added in the future.

* Simplify fallback when iFixedPoint is out of range

* Refactor projectPoints() to keep compatibilities

* Fix arg string "Bad rvecs header"

* Read calibration flags from test data files

Instead of being hard coded into source file, the calibration flags will
be read from test data files.
opencv_extra/testdata/cv/cameracalibration/calib?.dat must be sync with
the test code.

* Add new C interface of cvCalibrateCamera4()

With this new added C interface, the extended calibration method with
CALIB_RELEASE_OBJECT can be called by C API.

* Add regression test of extended calibration method

It has been tested with new added test data in xoox:calib-release-object
branch of opencv_extra.

* Fix assertion in test_cameracalibration.cpp

The total number of refined 3D object coordinates is checked.

* Add checker for iFixedPoint in cvCalibrateCamera4

If iFixedPoint is out of rational range, fall back to standard method.

* Fix documentation for overloaded calibrateCamera()

* Remove calibration flag of CALIB_RELEASE_OBJECT

The method selection is based on the range of the index of fixed point.
For minus values, standard calibration method will be chosen.  Values in
a rational range will make the object-releasing calibration method
selected.

* Use new interfaces instead of function overload

Existing interfaces are preserved and new interfaces are added. Since
most part of the code base are shared, calibrateCamera() is now a
wrapper function of calibrateCameraRO().

* Fix exported name of calibrateCameraRO()

* Update documentation for calibrateCameraRO()

The circumstances where this method is mostly helpful are described.

* Add note on the rigidity of the calibration target

* Update documentation for calibrateCameraRO()

It is clarified that iFixedPoint is used as a switch to select
calibration method. If input data are not qualified, exceptions will be
thrown instead of fallback scheme.

* Clarify iFixedPoint as switch and remove fallback

iFixedPoint is now used as a switch for calibration method selection. No
fallback scheme is utilized anymore. If the input data are not
qualified, exceptions will be thrown.

* Add badarg test for object-releasing method

* Fix document format of sample list

List items of same level should be indented the same way. Otherwise they
will be formatted as nested lists by Doxygen.

* Add brief intro for objectPoints and imagePoints

* Sync tutorial to sample calibration code

* Update tutorial compatibility version to 4.0
 2018-10-25 19:38:55 +03:00
catree
644846c702 Add a function that draws frame axes. Useful for debugging purpose and to check the correctness of the output of a pose estimation method. 2018-10-25 18:38:19 +02:00
Alexander Alekhin
d61ad04f11 Merge pull request #12868 from VladKarpushin:tutorial-using-periodic-noise-removing-filter 2018-10-24 20:24:50 +00:00
berak
ad356e3239 dnn/samples: handle not set env vars gracefully 2018-10-24 12:37:01 +02:00
Alexander Alekhin
329a1fb781 drop C-API sample code 2018-10-23 14:38:20 +03:00
Karpushin Vladislav
237b867721 doc: add new tutorial periodic noise removing filter 2018-10-18 14:15:27 +07:00
Alexander Alekhin
edacd91a27 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-15 20:15:42 +00:00
tompollok
0b77600718 change area() emptiness checks to empty() 2018-10-13 21:35:10 +02:00
Alexander Alekhin
5115e5decb Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-13 16:19:05 +00:00
Alexander Alekhin
0f41daeba5 Merge pull request #12641 from dkurt:dnn_samples_args_autofill 2018-10-13 12:28:08 +00:00
Alexander Alekhin
1ed9ff17e1 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-12 10:05:55 +00:00
Alexander Alekhin
f1fdfa1a51 Merge pull request #12623 from sturkmen72:videoio-4 2018-10-11 19:24:57 +00:00
Alexander Alekhin
de8024ce4a samples: prefer CMake from MSVS 
MSVS is shipped with CMake compoment.
 2018-10-11 19:19:16 +03:00
Alexander Alekhin
2b3c7490d5
Merge pull request #12521 from allnes:detect_qr_code 
Objdetect: QRCode detect + decode
 2018-10-11 12:42:05 +03:00
Suleyman TURKMEN
59bf2a34fa Update videoio 2018-10-10 21:58:04 +03:00
Alexander Nesterov
53ec8f286b Added QR code decoding. 2018-10-10 15:27:00 +00:00
Alexander Alekhin
288251e672 samples: add search for MSVS 2017 BuildTools 2018-10-10 00:34:34 +00:00
Alexander Alekhin
dada5a422d Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-09 21:20:15 +00:00
Alexander Alekhin
421fdc0e94
Merge pull request #12636 from alalek:winpack_samples_cpp_build_script 
* samples: add winpack "drap & drop" build script

* samples: add search for MSVS 2017 Enterprise
 2018-10-09 19:01:29 +03:00
Alexander Alekhin
8f1f4273a2 calib3d: move undistort files from imgproc 2018-10-05 07:52:21 +00:00
Sam Radhakrishnan
699db77293 Fixes #12692: Update samples/gpu/videoreader.cpp 
Change iteration to iterate separately when the video is decode on a GPU to account for different number of frames
 2018-10-03 17:42:57 +05:30
Alexander Alekhin
ea92c2b1a6 Merge pull request #12663 from sturkmen72:patch-12 2018-09-29 12:52:27 +00:00
Suleyman TURKMEN
8eb987e393 Update findContours parameter type 2018-09-28 18:42:48 +03:00
Alexander Alekhin
a8b0db4e5d Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-09-28 14:14:47 +03:00
Dmitry Kurtaev
ad5898224d Add a file with preprocessing parameters for deep learning networks 2018-09-25 18:28:37 +03:00
Dmitry Kurtaev
f8398d80bc add Net::getUnconnectedOutLayersNames method 2018-09-25 18:10:45 +03:00
Maksim Shabunin
a0211a1c2f Moved OpenGL sample to opengl folder 2018-09-24 13:13:30 +03:00
Maksim Shabunin
e0f524d3b7 Fixed several incorrect printf format specifiers 2018-09-24 11:31:40 +03:00
Alexander Alekhin
e8fcd721b8 Merge pull request #12612 from alalek:winpack_samples_python_launcher_update 2018-09-22 20:44:46 +00:00
Alexander Alekhin
ecef7f7930 samples: update winpack python samples launcher 
- accepts script parameter (allows drag & drop from 'explorer')
- use script dir instead of current dir (can launch samples from 'samples/dnn')
- added 'pause' to show error messages (about missing numpy) instead of instant closing
 2018-09-22 17:28:58 +00:00
Alexander Alekhin
a956732874 cmake: update install paths (Linux) 2018-09-19 15:43:52 +03:00
Alexander Alekhin
861415133e Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-09-19 10:58:43 +03:00
Alexander Alekhin
e6171d17f8 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-09-18 12:49:52 +03:00
Dmitry Kurtaev
b0ad7f759a Import tensorflow to create text graphs if import cv is failed 2018-09-18 09:11:51 +03:00
Alexander Alekhin
76d4aa0c06 Merge pull request #12531 from VladKarpushin:tutorial-using-anisotropic-image-segmentation 2018-09-17 12:06:46 +00:00
Vadim Pisarevsky
2113818f19 Merge pull request #12364 from dkurt:dnn_change_blob_from_image 2018-09-17 12:04:41 +00:00
Alexander Alekhin
808ba552c5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-09-14 23:44:35 +00:00
Karpushin Vladislav
c5687caf1a doc: add new tutorial anisotropic image segmentation 2018-09-14 13:14:17 +07:00
Dmitry Kurtaev
58ac3e09da Change default value of crop argument of blobFromImage from true to false 2018-09-12 19:02:58 +03:00
Vadim Pisarevsky
acbfd85737 Merge pull request #12204 from allnes:detect_qr_code 2018-09-12 11:55:44 +00:00
jsxyhelu
7828854c9d Merge pull request #12206 from jsxyhelu/3.4 
find innercircle of contour by using pointPolygonTest: (#12206)
 2018-09-11 23:58:01 +03:00
Alexander Nesterov
1fb7ee0e16 Optimiaztion search template lines and added sample 2018-09-11 11:46:36 +00:00
Alexander Alekhin
df8b057b44 avoid Ptr<> == NULL checks 2018-09-09 19:30:46 +00:00
Alexander Alekhin
73bfe68821 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-09-07 12:40:27 +03:00
Dmitry Kurtaev
d486204a0d Merge pull request #12264 from dkurt:dnn_remove_forward_method 
* Remove a forward method in dnn::Layer

* Add a test

* Fix tests

* Mark multiple dnn::Layer::finalize methods as deprecated

* Replace back dnn's inputBlobs to vector of pointers

* Remove Layer::forward_fallback from CV_OCL_RUN scopes
 2018-09-06 13:26:47 +03:00
Alexander Alekhin
43b64140ae Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-09-05 19:54:09 +03:00
Alexander Alekhin
a18da0c55e Merge pull request #12355 from sturkmen72:update_samples 2018-09-05 16:24:02 +00:00
Suleyman TURKMEN
b33cb2e3f2 Update samples 2018-09-05 18:16:40 +03:00
Alexander Alekhin
d74b98c3d9 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-09-04 18:39:03 +00:00
Alexander Alekhin
afb81ba6e6 samples: eliminate cvconfig.h usage 
- don't use TBB in samples
 2018-09-04 07:28:17 +00:00
Dmitry Kurtaev
c7cf8fb35c Import SSDs from TensorFlow by training config (#12188) 
* Remove TensorFlow and protobuf dependencies from object detection scripts

* Create text graphs for TensorFlow object detection networks from sample
 2018-09-03 17:08:40 +03:00
Vlad Karpushin
7d3a1657c9 doc: add new tutorial motion deblur filter (#12215) 
* doc: add new tutorial motion deblur filter

* Update motion_deblur_filter.markdown

a few minor changes
 2018-08-31 17:41:22 +03:00
Dmitry Kurtaev
50bceea038 Include preprocessing nodes to object detection TensorFlow networks (#12211) 
* Include preprocessing nodes to object detection TensorFlow networks

* Enable more fusion

* faster_rcnn_resnet50_coco_2018_01_28 test
 2018-08-31 15:41:56 +03:00
Alexander Alekhin
32a02544de Merge pull request #12189 from alalek:ippa_cleanup_3.4 2018-08-30 20:29:42 +00:00
Alexander Alekhin
e86287d8ae cleanup: IPP Async (IPP_A) 
except header file with conversion routines (will be removed in OpenCV 4.0)
 2018-08-30 18:53:07 +03:00
Nobuo Tsukamoto
ade57c8bd0 Fixed that object_detection.py does not work in python3. 2018-08-31 00:21:54 +09:00
Alexander Alekhin
c1db75e0c7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-08-29 16:24:56 +03:00
Suleyman TURKMEN
bed388bafb
Update opengl_interop.cpp 
resolves #12307
 2018-08-27 01:04:46 +03:00
Dmitry Kurtaev
472b71ecef Merge pull request #12243 from dkurt:dnn_tf_mask_rcnn 
* Support Mask-RCNN from TensorFlow

* Fix a sample
 2018-08-24 14:47:32 +03:00
Suleyman TURKMEN
d8cd1d8fcc Merge pull request #12246 from sturkmen72:move_enums 
* Update core.hpp

* Update imgproc.hpp

* Update ImgprocTest.java

* Update CameraCalibrator.java

* Update OnCameraFrameRender.java

* Update FindContoursDemo.java

* Update IntroductionToSVMDemo.java

* Update NonLinearSVMsDemo.java

* Update IntroductionToPCADemo.java

* Update Smoothing.java

* Update MainActivity.java

* Update CalcBackProjectDemo1.java

* Update CornerSubPixDemo.java

* Update CornerDetectorDemo.java

* Update GoodFeaturesToTrackDemo.java
 2018-08-24 11:11:34 +03:00
Alexander Alekhin
6356403964 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-08-22 17:38:51 +03:00
Alexander Alekhin
5ac9a2a7d0 Merge pull request #12219 from alalek:fix_assert_messages 2018-08-21 12:46:35 +00:00
Alexander Alekhin
7d4bb9428b Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-08-20 19:30:18 +03:00
Alexander Alekhin
31fef14d76 Merge pull request #12136 from sturkmen72:update_documentation 2018-08-17 14:02:20 +00:00
Suleyman TURKMEN
c61bc3a0cb Update documentation and samples 2018-08-17 14:21:29 +03:00
Alexander Alekhin
d2e08a524e core: repair CV_Assert() messages 
Multi-argument CV_Assert() is accessible via CV_Assert_N() (with malformed messages).
 2018-08-15 17:43:10 +03:00
Alexander Alekhin
b9b66ca437 Merge pull request #12205 from dkurt:dnn_update_tf_face_detection 2018-08-14 10:53:12 +00:00
Dmitry Kurtaev
22cb65ada9 Update face detection network in samples 2018-08-14 13:16:23 +03:00
Alexander Alekhin
e76b375a31 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-08-13 18:57:57 +03:00
Lucas Teixeira
f2d363feb2
Fix a Typo in the comment of asift.py 2018-08-09 23:43:39 +02:00
Alexander Alekhin
4eb2966559 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-08-07 20:12:10 +03:00
Vadim Pisarevsky
7c8ab271fc Merge pull request #12125 from dkurt:dnn_mobilenet_ppn 2018-08-06 14:40:50 +00:00
Vadim Pisarevsky
e0c93bcf6c Merge pull request #12082 from dkurt:dnn_ie_faster_rcnn 2018-08-06 14:28:58 +00:00
Pierre Jeambrun
5131619a1a feat(stitching): Add Sift support for the FeaturesFinder 2018-08-02 17:22:13 +03:00
Maksim Shabunin
df9efbbd1f Install data for samples to correct directories, do not download face_detector models in cmake 2018-08-02 14:24:05 +03:00
Dmitry Kurtaev
4fb086d6c3 MobileNet-SSD v1 from TensorFlow with shared convolution weights 2018-08-01 16:16:48 +03:00
Dmitry Kurtaev
8e034053af Faster-RCNN from TensorFlow on CPU with Intel's Inference Engine backend 2018-08-01 11:29:58 +03:00
Alexander Alekhin
82c477c9f7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-07-31 21:35:00 +03:00
luz.paz
2003eb1b9b Misc. typos 
Found via `codespell -q 3 -I ../opencv-whitelist.txt --skip="./3rdparty"`
 2018-07-31 18:44:23 +03:00
Suleyman TURKMEN
db8585701d Update create_mask.cpp 2018-07-30 21:42:22 +03:00
Karpushin Vladislav
a8e9a3a88d doc: add new tutorial "Out of focus deblur filter" 
In this tutorial you will learn:
- what is a degradation image model
- what is a PSF of an out-of-focus image
- how to restore a blurred image
- what is the Wiener filter
 2018-07-27 17:12:24 +07:00
Vadim Pisarevsky
fa466b022d Merge pull request #12052 from dkurt:dnn_ie_torch_tests 2018-07-26 09:09:35 +00:00
Dmitry Kurtaev
faa6c4e1e1 Faster-RCNN anf RFCN models on CPU using Intel's Inference Engine backend. 
Enable Torch layers tests with Intel's Inference Engine backend.
 2018-07-25 19:04:55 +03:00
Alexander Alekhin
9787ab598b Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-07-24 22:48:54 +03:00
Alexander Alekhin
8de08e0463 Merge pull request #12021 from dkurt:dnn_ie_tf_ssd 2018-07-24 13:03:41 +00:00
Paul92
8c7555523b Merge pull request #12032 from Paul92:mser-sample-improvments 
Mser sample improvments (#12032)

* Fixed bug in detect_mser sample
Wrong number of colors used to generate the synthetic images

* Formatting improvements

* Using safer casts

* Improved readability of legend generation

* Various readability fixes in detect_mser sample
 2018-07-22 17:08:29 +03:00
Dmitry Kurtaev
c213a3823e Run entire SSDs from TensorFlow using Intel's Inference Engine 2018-07-19 17:05:56 +03:00
Alexander Alekhin
4560909a5e Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-07-17 19:27:48 +03:00
Alexander Alekhin
50751ae6ff Merge pull request #11967 from catree:add_tutorial_ml_java_python 2018-07-16 09:24:32 +00:00
catree
41b95cae38 Add Java and Python code for ML tutorials. 2018-07-13 15:52:28 +02:00
Alexander Alekhin
625d20b9b4 Merge pull request #11949 from berak:dnn_object_detection_typo 2018-07-12 09:48:08 +00:00
berak
1c75f3d037 dnn: fix typo in object_detection.cpp sample 2018-07-12 11:06:53 +02:00
catree
c9fe6f1afe Add Java and Python code for the following tutorials: 
- Changing the contrast and brightness of an image!
      - Operations with images
 2018-07-11 20:14:58 +02:00
Alexander Alekhin
2da96be217 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-07-09 19:44:51 +03:00
Alexander Alekhin
203f95d3be samples: videocapture_camera use VideoCapture with 0 index 
Not all backends support -1 index.
 2018-07-03 15:44:53 +03:00
Alexander Alekhin
c52b4cf450 Merge pull request #11873 from catree:add_tutorial_features2d_java_python2 2018-07-02 15:02:14 +00:00
catree
481af5c469 Add Java and Python code for AKAZE local features matching tutorial. Fix incorrect uses of Mat.mul() in Java code. 
Uniform Lowe's ratio test in the code.
 2018-07-02 15:10:53 +02:00
Alexander Alekhin
3165baa1f1 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-07-02 14:58:29 +03:00
Dmitry Kurtaev
346871e27f Set output layers names and types for models in DLDT's intermediate representation 2018-06-28 10:21:45 +03:00
catree
7469981d1a Add Java and Python code for Image Segmentation with Distance Transform and Watershed Algorithm tutorial. Use more Pythonic code. 2018-06-27 18:48:32 +02:00
Vadim Pisarevsky
db48f7b5d1 Merge pull request #11804 from mshabunin:gst-sample 2018-06-27 14:26:27 +00:00
Alessandro de Oliveira Faria (A.K.A.CABELO)
cc8db99695 Include ELA example (#11819) 
* Include ELA example

* Include ELA example

* Include ELA example

* Include ELA example

* Include ELA example

* Include ELA example

* Include ELA example

* Include ELA example

* Include ELA example

* Include ELA example

* Include ELA example

* did some code cleanup

* fixed compile error
 2018-06-26 12:10:52 +03:00
Alexander Alekhin
b39cd06249 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-06-25 22:03:17 +03:00
Vadim Pisarevsky
e3dc7e5ec9 Merge pull request #11743 from alalek:samples_avoid_double_VideoCapture_open 2018-06-25 12:54:09 +00:00
Alexander Alekhin
70d6b8774d Merge pull request #11790 from berak:dnn_fix_coco_txt 2018-06-23 18:51:07 +00:00
Tomoaki Teshima
ffb9ce8287 suppress warning while building the samples 2018-06-23 21:35:25 +09:00
Maksim Shabunin
fe20fa8326 gstreamer sample: fixed incorrect pipelines being generated 2018-06-21 17:14:42 +03:00
berak
8f7a3b15b2 dnn: add a coco labels file for yolov3 2018-06-19 10:45:49 +02:00
Alexander Alekhin
0d6518aaa0 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
 2018-06-13 19:34:44 +03:00
Alexander Alekhin
aef16d51ec samples: don't call twice of VideoCapture::open() 2018-06-11 23:17:49 +00:00
catree
a11ef2650e Add Java and Python code for the following imgproc tutorials: Finding contours in your image, Convex Hull, Creating Bounding boxes and circles for contours, Creating Bounding rotated boxes and ellipses for contours, Image Moments, Point Polygon Test. 2018-06-10 23:57:11 +02:00
Alexander Alekhin
93f2fd396b Merge pull request #11723 from alalek:sample_videocapture_camera 2018-06-09 13:49:21 +00:00
Alexander Alekhin
929d39f69a Merge pull request #11728 from dkurt:dnn_update_tf_ssd 2018-06-08 19:04:28 +00:00
catree
afa5b0cc93 Add Java and Python code for cascade classifier and HDR tutorials. 2018-06-08 19:30:30 +02:00
Dmitry Kurtaev
40765c5f8d Enable SSD models from TensorFlow with OpenCL plugin of Intel's Inference Engine 2018-06-08 16:55:21 +03:00
Alexander Alekhin
a7047dd4b6 samples: add videocapture_camera sample 
- show capturing information: width / height / fps
- show average FPS for cap.read()+imshow() via cv::getTickCount()
- optional frame processing code path
 2018-06-08 15:51:46 +03:00
David
7175f257b5 Added ResizeBilinear op for tf (#11050) 
* Added ResizeBilinear op for tf

Combined ResizeNearestNeighbor and ResizeBilinear layers into Resize (with an interpolation param).

Minor changes to tf_importer and resize layer to save some code lines

Minor changes in init.cpp

Minor changes in tf_importer.cpp

* Replaced implementation of a custom ResizeBilinear layer to all layers

* Use Mat::ptr. Replace interpolation flags
 2018-06-07 16:29:04 +03:00
Alexander Alekhin
9b0bafb82c samples: fix callback function type 2018-06-06 18:29:05 +03:00
Vadim Pisarevsky
3cbd2e2764 Merge pull request #11650 from dkurt:dnn_default_backend 2018-06-06 09:30:39 +00:00
Alexander Alekhin
45dd575ed2 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb.

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489.
 2018-06-04 19:26:10 +03:00
Dmitry Kurtaev
b781ac7346 Make Intel's Inference Engine backend is default if no preferable backend is specified. 2018-06-04 18:31:46 +03:00
Alexander Alekhin
dcb9bc2544 python: eliminate pylint warnings 
Tested with:
- pylint 1.9.1
 2018-06-04 17:58:06 +03:00
Vadim Pisarevsky
3030594665 Merge pull request #11644 from alalek:docs_avoid_master_links_in_3.4-2 2018-06-04 10:19:44 +00:00
Alexander Alekhin
6912c20380 Merge pull request #11659 from take1014:snippet_11597 2018-06-01 16:48:10 +00:00
take1014
4ec9afac57 add imgproc snippets 2018-06-01 23:42:00 +09:00
Alexander Alekhin
f185802489 documentation: avoid links to 'master' branch from 3.4 maintenance branch (2) 
Other links:
- https://raw.githubusercontent.com/opencv/opencv/master
- https://github.com/opencv/opencv/blob/master
 2018-05-31 19:30:56 +03:00
Alexander Alekhin
9ba9358ecb documentation: avoid links to 'master' branch from 3.4 maintenance branch 2018-05-31 16:45:18 +03:00
Vadim Pisarevsky
c58cc4c2ff Merge pull request #11255 from dkurt:dnn_tf_faster_rcnn 2018-05-31 11:07:39 +00:00
Dmitry Kurtaev
f96f934426 Update Intel's Inference Engine deep learning backend (#11587) 
* Update Intel's Inference Engine deep learning backend

* Remove cpu_extension dependency

* Update Darknet accuracy tests
 2018-05-31 14:05:21 +03:00
Spark Echo
80770aacd7 Merge pull request #11631 from sparkecho:3.4 
Typo fixes (#11631)
 2018-05-31 07:23:19 +00:00
Dmitry Kurtaev
bf87a43185 Faster-RCNN object detection models from TensorFlow 2018-05-30 17:12:36 +03:00
Alexander Alekhin
d738f56d83 Merge pull request #11598 from catree:add_tutorial_features2d_java_python 2018-05-29 15:18:44 +00:00
catree
ade21f142e Add Java and Python code for the following features2d tutorials: Harris corner detector, Shi-Tomasi corner detector, Creating your own corner detector, Detecting corners location in subpixels, Feature Detection, Feature Description, Feature Matching with FLANN, Features2D + Homography to find a known object. Use Lowe's ratio test to filter the matches. 2018-05-29 10:35:57 +02:00
Alexander Alekhin
0f298a4203 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-28 11:22:55 +00:00
catree
adef31097d Use directly HighGui.toBufferedImage(). 2018-05-25 16:23:42 +02:00
Alexander Alekhin
8a17ae29b9 Merge pull request #11580 from dkurt:dnn_fix_tf_ssd 2018-05-24 18:28:41 +00:00
catree
4c1c3147d9 Add Java and Python code for the following imgproc tutorials: Affine Transformations, Histogram Equalization, Histogram Calculation, Histogram Comparison, Back Projection. 2018-05-24 01:11:28 +02:00
Dmitry Kurtaev
3346a7ac0a Fix batch normalization fusion from TensorFlow's SSDs 2018-05-23 16:49:31 +03:00
Alexander Alekhin
5e68f35500 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-22 19:02:01 +03:00
Alexander Alekhin
af5f40a80e Merge pull request #11543 from catree:add_tutorial_imgproc_java_python 2018-05-22 12:26:34 +00:00
Alexander Alekhin
db88cd1b25 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-21 16:20:14 +03:00
Alexander Alekhin
085b27fc3d Merge pull request #11390 from dkurt:east_text_detection 2018-05-21 13:02:29 +00:00
catree
9f6108ae7a Add Java and Python code for the following imgproc tutorials: Canny, Remap, threshold and threshold inRange. Use HSV colorspace instead of RGB for inRange threshold tutorial. 2018-05-18 20:11:53 +02:00
Dmitry Kurtaev
07dc6d2b45 Return a convex hull from rotatedRectangleIntersection 2018-05-18 14:20:17 +03:00
catree
9fc0cabdf5 Add Java and Python code for trackbar tutorial. 2018-05-18 11:29:41 +02:00
Alexander Alekhin
ba6b9fd261 Merge pull request #11529 from catree:add_tutorial_morphology_python_java 2018-05-16 19:40:02 +00:00
catree
7e3490959a Add Java and Python code for morphology tutorials. 2018-05-16 14:19:48 +02:00
Alexander Alekhin
ed63c43cda Merge pull request #11519 from paroj:openni_color 2018-05-15 16:54:24 +00:00
Pavel Rojtberg
9573644387 samples: openni_capture - use COLORMAP_JET for depth visualization 
instead of an ad-hoc implementation of it
 2018-05-15 11:31:14 +02:00
Alexander Nesterov
9bd5739125 Remove command line argument related to container 2018-05-14 16:32:12 -03:00
Alexander Alekhin
68c92908d5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-14 15:17:35 +03:00
Alexander Alekhin
b7a9d966d7 Merge pull request #11506 from catree:tutorial_euler_angles_doc 2018-05-13 17:36:13 +00:00
catree
d02ecff881 Clarify the Euler angles convention chosen. Replace rotation inverse with matrix transpose. 2018-05-12 01:11:13 +02:00
Alexander Alekhin
78f205ffa5 python: better Python 3 support 2018-05-11 17:32:04 +03:00
Alexander Alekhin
df02fe0615 Merge pull request #11445 from cclauss:file-long-raw_input-xrange 2018-05-11 13:28:53 +00:00
Alexander Alekhin
8356a6b6ab Merge pull request #11442 from cclauss:print-function 2018-05-11 13:26:04 +00:00
Dmitry Kurtaev
8488f2e265 EAST: An Efficient and Accurate Scene Text Detector (https://arxiv.org/abs/1704.03155v2) 2018-05-11 14:55:42 +03:00
Alexander Alekhin
314246d396 Merge pull request #11459 from dkurt:dnn_mobilenet_v2 2018-05-11 09:48:05 +00:00
Alexander Alekhin
51e543050c Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-10 18:19:56 +03:00
cabelo
1b3e0783f4 select the device (video capture) 2018-05-09 17:20:02 +03:00
Dmitry Kurtaev
d381948cee Update script to generate MobileNet-SSD V2 text graph 2018-05-04 07:55:18 +03:00
Sayed Adel
e00a58a05f samples: add C++11 override to virtual methods 2018-05-03 20:12:24 +00:00
Alexander Alekhin
000a13b6a3 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-03 14:30:38 +00:00
cclauss
8a79b167b8 Define execfile, file, long, raw_input, xrange for Python 3 2018-05-03 09:19:05 +02:00
cclauss
05c1a3d160 print() is a function in Python 3 2018-05-03 07:12:12 +02:00
Dmitry Kurtaev
d5b9563263 Custom deep learning layers in Python 2018-04-26 09:25:18 +03:00
Alexander Alekhin
cd2b188c9a Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-04-24 18:13:06 +03:00
Alexander Alekhin
84db82a329 build: fix warnings 2018-04-24 16:15:22 +03:00
Dmitry Kurtaev
4ec456f0a0 Custom layers for deep learning networks (#11129) 
* Custom deep learning layers support

* Stack custom deep learning layers
 2018-04-24 14:59:59 +03:00
Alexander Nesterov
1367a58b54 Added encode-pipeline to sample 2018-04-23 21:57:41 +03:00
Alexander Alekhin
4d7d630e92 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-04-23 18:45:02 +03:00
Vadim Pisarevsky
b290bdafb9 Merge pull request #11322 from dkurt:dnn_yolov3 2018-04-18 12:11:13 +00:00
Vadim Pisarevsky
b8b7ca7302
Rewite polar transforms (#11323) 
* Rewrite polar transformations

- A new wrapPolar function encapsulate both linear and semi-log remap
- Destination size is a parameter or calculated automatically to keep objects size between remapping
- linearPolar and logPolar has been deprecated

* Fix build warning and error in accuracy test

* Fix function name to warpPolar

* Explicitly specify the mapping mode, so we retain all the parameters as non-optional.

Introduces WarpPolarMode enum to specify the mapping mode in flags

* resolves performance warning on windows build

* removed duplicated logPolar and linearPolar implementations
 2018-04-17 15:50:52 +03:00
Dmitry Kurtaev
97fec07d96 Support YOLOv3 model from Darknet 2018-04-16 18:44:12 +03:00
Alexander Alekhin
4b2d1aaeea Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-04-16 12:41:47 +03:00
Vadim Pisarevsky
533bb89800 Merge pull request #11236 from dkurt:dnn_fuse_l2_norm 2018-04-11 15:09:55 +00:00
Alexander Alekhin
c6aa97c9aa next(android): java3 -> java4 2018-04-10 18:09:54 +03:00
Alexander Alekhin
d4688e6474 cmake: require C++11 and CMake 3.5.1+ 2018-04-10 18:09:54 +03:00
Dmitry Kurtaev
1ba72ca0d3 Fuse tf.nn.l2_normalize layer 2018-04-10 10:12:44 +03:00
Vadim Pisarevsky
b6d45b9743 Merge pull request #11244 from alalek:cuda_samples_drop_performance 2018-04-09 09:44:29 +00:00
Vadim Pisarevsky
569011a121 Merge pull request #11245 from alalek:cuda_samples_drop_low_level_api 2018-04-09 09:41:47 +00:00
Vishwa Prakash H V
6b4fcd5f73
Avoiding Divide By Zero Error 
In line 104 `if ( full_neg_lst[i].cols >= box.width && full_neg_lst[i].rows >= box.height )` removed '=' as it causes divide By Zero Error in line 106 and 107 `box.x = rand() % ( full_neg_lst[i].cols - size_x );` when  full_neg_lst[i].cols = size_x or full_neg_lst[i].rows - size_y
 2018-04-08 02:57:26 +05:30
Alexander Alekhin
0093eb4768 cuda: drop samples for low-level CUDA API 
Also these samples require TBB, so they are not tested during default OpenCV builds
 2018-04-05 19:35:46 +00:00
Alexander Alekhin
dd243067e5 cuda: drop performance sample 
Regular OpenCV perf tests should be used instead
 2018-04-05 19:28:17 +00:00
Alexander Alekhin
7818071ba2 cuda: eliminate part of build warnings 2018-04-05 17:53:22 +03:00
Alexander Alekhin
3870891d2d update samples/dnn/face_detector/.gitignore 2018-04-04 19:12:50 +03:00
Alexander Alekhin
7bc980edaf Merge pull request #10983 from dkurt:dnn_face_detection_uint8 2018-04-03 18:19:43 +00:00
Alexander Alekhin
53944cbebb samples: avoid using of legacy code constructions in viz sample 2018-04-03 16:05:43 +03:00
Maksim Shabunin
9558a35cde Merge pull request #11055 from allnes:gst_streamer 2018-04-03 11:04:22 +00:00
Dmitry Kurtaev
8d8f3bca6f Update links to OpenCV's face detection network 2018-04-02 13:02:56 +03:00
Alexander Alekhin
82fd00af99 fix build issues with QT/OpenGL 2018-03-30 12:49:09 +03:00
Alexander Nesterov
7252319966 Added gstreamer pipeline sample 2018-03-29 23:44:42 +03:00
Alexander Alekhin
e28cc973bf samples: avoid using of legacy C-like API (part 2) 2018-03-29 14:17:23 +03:00
Alexander Alekhin
d800a0bd32 samples: suppress vtk warnings 2018-03-28 18:43:28 +03:00
Alexander Alekhin
cfdffdd519 samples: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:28 +03:00
Alexander Alekhin
d7e9201434 misc: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:28 +03:00
Alexander Alekhin
8388b630ac Merge pull request #11167 from alalek:cmake_compiler_vars 2018-03-28 12:38:31 +00:00
Dmitry Kurtaev
f87a0dd6a7 Fix minimal aspect ratio scale for SSDs from TensorFlow 2018-03-28 12:57:06 +03:00
Alexander Alekhin
08941b7890 cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars 
- Recommended compiler checks:
  - GCC: CV_GCC
  - Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
  Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler
 2018-03-27 16:16:59 +03:00
Alexander Alekhin
7f9253ea0a samples: avoid using of legacy C-like API 
- CV_RGB() macro is moved into opencv2/imgproc.hpp from imgproc_c.h
- samples/cpp/filestorage_base64.cpp is dropped
 2018-03-26 13:42:35 +03:00
Alexander Alekhin
2dac35a97d Merge pull request #11091 from berak:openpose_sample 2018-03-18 09:18:40 +00:00
Alexander Alekhin
70b6c1f29e Merge pull request #11069 from berak:fix_samples_beta 2018-03-16 19:30:20 +00:00
berak
4f597f6c06 dnn: add an openpose.cpp sample 2018-03-16 19:36:45 +01:00
berak
182b52d23d fix some samples colliding with std::beta 
also add comments explaining the change
 2018-03-15 12:40:49 +01:00
atinfinity
8a8523d4f3 fixed samples/dnn/openpose.py 2018-03-15 05:17:57 +09:00
Alexander Alekhin
ab110c0ad1 Merge pull request #10979 from dkurt:unite_dnn_samples 2018-03-14 14:33:49 +00:00
Dmitry Kurtaev
130546e1d9 Semantic segmentation sample. 2018-03-08 11:02:26 +03:00
Maksim Shabunin
1ae02c0cc4 Minor refactoring in several C++ samples: 
- bgfg_segm
- peopledetect
- opencv_version
- dnn/colorization
- tapi/opencl_custom_kernel
- tapi/dense_optical_flow (renamed tvl1_optical_flow)
 2018-03-06 14:23:20 +03:00
Dmitry Kurtaev
f2440ceae6 Update tutorials. A new cv::dnn::readNet function 2018-03-04 20:30:22 +03:00
Dmitry Kurtaev
8e4fe30db6 Unite deep learning image classification samples 2018-03-03 16:43:21 +03:00
Dmitry Kurtaev
e8d94ea87c Unite deep learning object detection samples 2018-03-03 14:47:13 +03:00
Alexander Alekhin
d1cecb0f0f Merge pull request #10968 from sergiomb2:master 2018-03-02 11:39:54 +00:00
whizzzkid
5c66ce7f29 cuda: fixes gpu samples build (issue 10953) 2018-02-28 13:22:58 -07:00
Sérgio M. Basto
20f5fa8e3e Fix build with VA 
This commit readd ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES}
that was missed in commit 2200e13c71

    diff --git a/samples/va_intel/CMakeLists.txt b/samples/va_intel/CMakeLists.txt
    -    ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
    +  ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
 2018-02-28 19:26:54 +00:00
Dmitry Kurtaev
8b4871a28d Use only absolute prior boxes explicit sizes. Remove scales attributes. (#10874) 
* Use only absolute prior boxes explicit sizes. Remove scales attributes.

* Simplified PriorBox layer forward pass
 2018-02-19 17:25:18 +03:00
Maksim Shabunin
aa7a964139 Merge pull request #10868 from mshabunin:sample-bgsegm 
* Samples: reworked bgfg_bgsegm

* fixup! Samples: reworked bgfg_bgsegm
 2018-02-17 15:04:14 +03:00
Steven
6f4e35cc0e fix tutorial on real time pose estimation 2018-02-15 15:48:52 +01:00
Maksim Shabunin
f78b9468dd Samples: fixed samples build in case the viz module is disabled 2018-02-14 12:45:10 +03:00
Maksim Shabunin
c63092781a Samples: fixed viz tutorials building with enabled opencv_world 2018-02-12 18:42:36 +03:00
Maksim Shabunin
2d1350a9d6 Added group targets for samples (opencv_samples, opencv_samples_<group>), install samples/data inseparate component 'samples_data' 2018-02-12 18:42:36 +03:00
Maksim Shabunin
2200e13c71 cmake: refactored scripts with samples building: 
- allow installing samples sources on all platforms
  even if BUILD_EXAMPLES is disabled,  fixed minor
  issues in sources installation process
- use 'example_<group>_<name>' scheme for target and binary file naming
- use single function for sample executable creation
 2018-02-12 18:42:36 +03:00
Maksim Shabunin
633b0e56a5 Fixed compilation warnings in samples: 
- use per-module includes instead of "opencv.hpp"
- unused function warnings
- undefined macro warning
 2018-02-12 18:42:36 +03:00
Sui Libin
1ad814a191 fix faster_rcnn sample crashed at PoolingInvoker on Windows7(x64). (#10724) 
* fix faster_rcnn sample crashed at PoolingInvoker operator() of pooling_layer.

* find_odj onmouse bug about find matched point status.

* reverted AutoBuffer back to std::vector
 2018-02-12 16:07:56 +03:00
take1014
03407a9da0 Merge pull request #10646 from take1014:master 
* Add a new interface for hough transform

* Fixed warning code

* Fix HoughLinesUsingSetOfPoints based on HoughLinesStandard

* Delete memset

* Rename HoughLinesUsingSetOfPoints and add common function

* Fix test error

* Change static function name

* Change using CV_Assert instead of if-block and add integer test case

* I solve the conflict and delete 'std :: tr1' and changed it to use 'tuple'

* I deleted std::tr1::get and changed int to use 'get'

* Fixed sample code

* revert test_main.cpp

* Delete sample code in comment and add snippets

* Change file name

* Delete static function

* Fixed build error
 2018-02-08 22:54:43 +03:00
luz.paz
dbb57cd0ae Misc. ./samples typos 
Found via `codespell -q 3 --skip="./3rdparty" -I ../opencv-whitelist.txt`
 2018-02-08 05:52:08 -05:00
Alexander Alekhin
44d7435a48 build: eliminate calls of removed functionality from C++17 
Most part is deprecated since C++11
 2018-02-07 12:00:33 +03:00
Alexander Alekhin
c973aaabc5 Merge pull request #10787 from dkurt:dnn_tutorial_face_detection 2018-02-06 14:37:09 +00:00
Dmitry Kurtaev
8817907647 Test for FP16 version of OpenCV face detection network 2018-02-06 13:16:07 +03:00
Alexander Alekhin
2a1f46c42d Merge pull request #9770 from alalek:refactor_test_files 2018-02-06 09:33:58 +00:00
Dmitry Kurtaev
10e1de74d2 Intel Inference Engine deep learning backend (#10608) 
* Intel Inference Engine deep learning backend.

* OpenFace network using Inference Engine backend
 2018-02-06 11:57:35 +03:00
berak
56bcdfd7d9 Merge pull request #10777 from berak:dnn_colorize_cpp 
* dnn: add colorization.cpp

* Update arguments of dnn/colorization.py
 2018-02-05 15:07:40 +03:00
Dmitry Kurtaev
5f6077bc62 Tool to generate text graphs for SSD models from TensorFlow (#10723) 
* Added tool to generate text graph for SSD models from TensorFlow

* Update tf_text_graph_ssd.py
 2018-02-05 13:00:43 +03:00
Alexander Alekhin
4a297a2443 ts: refactor OpenCV tests 
- removed tr1 usage (dropped in C++17)
- moved includes of vector/map/iostream/limits into ts.hpp
- require opencv_test + anonymous namespace (added compile check)
- fixed norm() usage (must be from cvtest::norm for checks) and other conflict functions
- added missing license headers
 2018-02-03 19:39:47 +00:00
Alexander Alekhin
35738bcadd samples: remove orphan documentation snippet: SBM_Sample.cpp 2018-01-31 18:54:08 +00:00
Jozef Mlich
7a472d85ef Merge pull request #10663 from jmlich:master 
* hogsvm compatibility with python3
 2018-01-24 17:03:23 +03:00
Vadim Pisarevsky
a1d2258ac3 Merge pull request #10635 from csukuangfj:doc-checkVector 2018-01-23 10:42:05 +00:00
Fangjun Kuang
8efe7bafaa Improve the doc for cv::Mat::checkVector. 2018-01-18 16:48:59 +01:00
Vadim Pisarevsky
42459cad02 Merge pull request #10634 from sturkmen72:update_samples 2018-01-18 13:46:27 +00:00
Alexander Alekhin
f056e713c3 Merge pull request #10512 from sturkmen72:update_documentation 2018-01-18 04:44:59 +00:00
Suleyman TURKMEN
4046d9f850 Update samples 2018-01-18 07:04:42 +03:00
Alexander Alekhin
8533b45ce9 cmake: Java/Android SDK refactoring 2018-01-13 02:12:39 +00:00
Suleyman TURKMEN
dcd4f8f5db Update documentation 2018-01-12 22:21:14 +03:00
Alessandro de Oliveira Faria (A.K.A.CABELO)
c71dc78cd4 Merge pull request #10502 from cabelo/save-dnn-yolo 
Save video file (#10502)
 2018-01-08 22:30:28 +03:00
LaurentBerger
004a1cd64a Merge pull request #10529 from LaurentBerger:ExampleGoogleNet 
* Add a parameter labels to command line

* default value

* samples: caffe_googlenet.cpp minor refactoring
 2018-01-06 23:44:47 +03:00
Alexander Alekhin
f46eff4eb0 Merge pull request #10492 from pengli:dnn 2018-01-04 04:40:02 +00:00
Li Peng
1073175c77 add opencl option for resnet_ssd_face sample 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-01-04 18:40:56 +08:00
Alessandro de Oliveira Faria (A.K.A.CABELO)
7abaae39ec Merge pull request #10446 from cabelo:style-dnn-yolo 
* add style draw in yolo

* fix sintaxe whitespace

* fix conversion from float to int

* sample refactoring

- minor code style fixes
- avoid confusing "bottom" names
- use cv::format
- always draw object detection/roi
 2018-01-02 17:26:29 +03:00
Dmitry Kurtaev
d0580df339 Update C++ MobileNet-SSD object detection sample 2018-01-01 23:01:23 +03:00
victor-ludorum
914d9662d3 Merge pull request #10469 from victor-ludorum:stichingbranch 
Updating stiching.cpp to resolve new line issue #10461 (#10469)
 2017-12-30 21:22:02 +03:00
Alexander Alekhin
eba176c299
Merge pull request #10398 from alalek:ml_simplify_simulated_annealing 2017-12-22 22:43:59 +03:00
Alexander Alekhin
289a8da39e ml: simplify interfaces of SimulatedAnnealingSolver 2017-12-22 16:35:48 +03:00
Vadim Pisarevsky
b85c77283b Merge pull request #10396 from berak:fix_superres_sample 2017-12-22 13:35:36 +00:00
berak
ddbd074678 samples: check for valid input in gpu/super_resolution.cpp 2017-12-22 12:34:25 +01:00
Vadim Pisarevsky
e72a053cca Merge pull request #10354 from catree:add_python_sample_show_extrinsics 2017-12-20 14:23:01 +00:00
Vadim Pisarevsky
b8a24b36ce Merge pull request #10356 from dkurt:dnn_rfcn 2017-12-20 14:19:46 +00:00
catree
59ec224009 Update left_intrinsics.yml file with chessboard square_size=0.025 and with extrinsic parameters. Add camera_calibration_show_extrinsics.py, a Python sample that allows to display the extrinsics saved during the camera calibration process (cpp-example-calibration). 2017-12-20 12:06:08 +01:00
Dmitry Kurtaev
0ed2cbc931 R-FCN models support 2017-12-20 10:43:22 +03:00
catree
87160cb297 Add Demo 5: Basic panorama stitching from a rotating camera in the homography tutorial. 2017-12-19 22:45:35 +01:00
Suleyman TURKMEN
1654dfe3a9 Update samples (#10333) 
* Update samples

* Update calib3d.hpp

* Update calib3d.hpp

* Update calib3d.hpp

* Update calib3d.hpp
 2017-12-18 13:44:11 +03:00
Alexander Alekhin
70e1b4ddf0
Merge pull request #10319 from catree:move_SimulatedAnnealingSolver_Impl_cpp 
Move SimulatedAnnealingSolver::Impl in cpp file
 2017-12-15 23:06:48 +03:00
Rostislav Vasilikhin
bab86d65cb Merge pull request #10258 from savuor:fix/kmeans_channels 
* kmeans: number of channels in _centers fixed

* fixedType() is checked now
 2017-12-15 21:48:48 +03:00
Alexander Alekhin
aef3019152 ml: fix SimulatedAnnealingSolver interface 2017-12-15 21:44:32 +03:00
Alexander Alekhin
28b19d6e3e
Merge pull request #10313 from alalek:rename_fix 
Fix file names
 2017-12-15 21:40:22 +03:00
Vadim Pisarevsky
62359f70ff Merge pull request #10306 from dkurt:faster_rcnn 2017-12-15 12:23:53 +00:00
Alexander Alekhin
d5f152494b fix file names 2017-12-15 14:59:35 +03:00
LaurentBerger
7ad308ea47 Simulated Annealing for ANN_MLP training method (#10213) 
* Simulated Annealing for ANN_MLP training method

* EXPECT_LT

* just to test new data

* manage RNG

* Try again

* Just run buildbot with new data

* try to understand

* Test layer

* New data- new test

* Force RNG in backprop

* Use Impl to avoid virtual method

* reset all weights

* try to solve ABI

* retry

* ABI solved?

* till problem with dynamic_cast

* Something is wrong

* Solved?

* disable backprop test

* remove ANN_MLP_ANNEALImpl

* Disable weight in varmap

* Add example for SimulatedAnnealing
 2017-12-15 13:57:39 +03:00
Dmitry Kurtaev
08112f3821 Faster-RCNN models support 2017-12-15 12:16:21 +03:00
catree
b417fb0939 Add tutorial and codes for the homography tutorial. 2017-12-14 15:40:10 +01:00
Vitaly Tuzov
51cb56ef2c Implementation of bit-exact resize. Internal calls to linear resize updated to use bit-exact version. (#9468) 2017-12-13 15:00:38 +03:00
Vadim Pisarevsky
7e680bd9ff Merge pull request #10215 from dkurt:dnn_js 2017-12-11 12:47:52 +00:00
Vadim Pisarevsky
766a0c0f25 Merge pull request #10277 from pengli:dnn 2017-12-11 12:44:21 +00:00
Vadim Pisarevsky
61c2f094b9 Merge pull request #10280 from alalek:python_cv2_to_cv 2017-12-11 12:39:00 +00:00
Vadim Pisarevsky
558b17dede Merge pull request #10231 from alalek:ocl_refactor_program_api 2017-12-11 12:34:22 +00:00
Alexander Alekhin
5560db73bf python: 'cv2.' -> 'cv.' via 'import cv2 as cv' 2017-12-11 13:46:55 +03:00
Li Peng
88507fa051 add command parser to caffe googlenet sample 
Signed-off-by: Li Peng <peng.li@intel.com>
 2017-12-11 17:54:50 +08:00
Haritha
be4fa03fac crop parameter usage in blobFromImage() calls 2017-12-09 17:13:35 +05:30
Dmitry Kurtaev
f503515082 JavaScript bindings for dnn module 2017-12-08 18:33:48 +03:00
Alexander Alekhin
1625ffa2cf ocl: opencl_custom_kernel.cpp example 2017-12-07 16:50:07 +03:00
Alexander Alekhin
72de03d749 Merge pull request #10243 from berak:dnn_fix_mobilenet_sample 2017-12-07 09:54:18 +00:00
berak
159ea22b6b dnn: add a check for webcam properties in ssd_mobilenet sample 2017-12-06 14:55:37 +01:00