1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-17 07:04:18 +08:00
Commit Graph

2932 Commits

Author SHA1 Message Date
Tobias Senst
40b238b01d Merge pull request #2367 from tsenst:add_robust_interpolation_of_correspondence
Add RIC method for sparse match interpolation

* * add RIC

* sparse_match_interpolators EdgeAwareInterpolation - enhance limitation of the maximal number of matches to be interpolated from SHORT_MAX to INT_MAX by substituting short by int types

* * add RIC citation

* * update EdgeAwareInterpolatorImpl

* * add intermediate RIC implementation

* * implementation of new paralelization classes. First test where sucessfull.

* * update documentation RICInterpolatorImpl and RLOF

* * update CMakeLists.txt remove highgui
* add test for RIC
* add ASSERTION for curr image

* * add cost map interface

* * fix internal cost map allocation bug

* * remove white spaces
* fix warnings

* *fix compiler warnings

* * remove double whitespaces
* underscore from parameters
* substitute parallel_for_() classes with lambda functions
* remove complex assertion statements
* remove dead code
* substitute swap function with std::swap()
* ocv_define_module now contains video instead of tracking module

* * remove whitespace endings

* * documentation update

* * remove double declarations that lead to warnings

* * unrole tracker.py
*  remove double space
* use static for inner functions
* update create function
* modify mem init. to avoid manual memory management

* * uncomment parallel_for_ for parallelization

* * unrole unwanted changes
* uncomment paralellization

* * remove empty comment
* change CHECK to CHK_GD
* remove not necessary ;

* *documentation remove double space
2019-12-09 18:46:16 +03:00
Alexander Alekhin
cacec38ec1 Merge pull request #2380 from cudawarped:patch_cudacodec_memory_leak 2019-12-09 15:41:00 +00:00
Alexander Alekhin
83ad5c6383 Merge pull request #2378 from bansan85:master 2019-12-07 20:30:01 +00:00
cudawarped
7cb627a372 Patch cv::cudacodec::createVideoReader() memory leak until cudacodec can be updated to miirror NVidia example code. 2019-12-06 17:42:15 +00:00
LE GARREC Vincent
9bc0d8d0b4 Fix compilation with +cuda -optflow 2019-12-05 17:03:33 +01:00
Alexander Alekhin
7011e1b1cb Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-12-05 17:43:43 +03:00
Alexander Alekhin
d01edbd66b Merge pull request #2375 from alalek:backport_contrib_2369 2019-12-05 14:37:21 +00:00
Alexander Alekhin
a89f104d19 Merge pull request #2374 from alalek:backport_contrib_2372 2019-12-05 14:36:28 +00:00
Lizeth Huertas
5efd1e2f5f shift corner positions to the correct rotation
backport commit 13f7637585
2019-12-05 14:49:42 +03:00
Alexander Alekhin
d0d86695f8 Merge pull request #2369 from bwignall:typo 2019-12-04 16:25:08 +00:00
Brian Wignall
078c45633d Fix typos
backport commit 8c09249352
2019-12-04 19:22:08 +03:00
Alexander Alekhin
dc1934410a Merge pull request #2372 from szk1509:invMarkerCorner 2019-12-04 16:19:26 +00:00
cudawarped
7cbe83f217 Merge pull request #2362 from cudawarped:fix_cudacodec_python
Fix cudacodec::VideoReader::nextFrame python bindings

* Signla to python bindings generator that nextFrame's OutputArray is a GpuMat.
Also remove duplicate test in cudacodec

* cudacodec: drop CV_GPU, wrap GpuMat only

* Make it explicit that frame in nextFrame is GpuMat and cannot be multiple types as implied by OutputArray
2019-12-04 18:58:06 +03:00
Lizeth Huertas
13f7637585 shift corner positions to the correct rotation 2019-12-04 11:55:57 +01:00
Alexander Alekhin
d930ad9c77 rgbd: don't use CV__ENABLE_C_API_CTORS 2019-12-03 15:20:22 +03:00
Brian Wignall
8c09249352 Fix typos 2019-12-02 07:23:05 -05:00
Alexander Alekhin
763a451654 Merge pull request #2365 from malfet:dont-use-VLA 2019-12-01 21:39:16 +00:00
Nikita Shulga
42e049278b Do not use VLA in dynafu.cpp
VLA is part of C99, but still not part of C++ standard
Replace float variable-length-arrays with unique_ptr arrays (which are
part of C++14)
2019-11-28 06:30:59 -08:00
Pavel Rojtberg
8f2b705d0e ovis: implement setting diffuse color 2019-11-27 17:28:31 +01:00
Pavel Rojtberg
8a8d609afa ovis: drop several workarounds for old OGRE versions
not needed since we require OGRE 1.11.5 via CMake
2019-11-27 17:28:31 +01:00
Alexander Alekhin
c9514b8049 Merge pull request #2358 from paroj:ovisup 2019-11-25 20:05:55 +00:00
Alexander Alekhin
6a9555886e Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-11-22 22:37:37 +00:00
Pavel Rojtberg
647e79cfcc ovis: addResourceLocation - assert pre-condition 2019-11-22 12:16:07 +01:00
Pavel Rojtberg
3604786e6b ovis: add support for off-screen windows 2019-11-22 12:16:07 +01:00
czgdp1807
854d33bca9 shifted constructor and destructor definitions 2019-11-20 17:13:20 +05:30
Alexander Alekhin
dff1422532 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-11-19 18:58:56 +00:00
Gagandeep Singh
b3ad2c323d Merge pull request #2341 from czgdp1807:issue-2277
Added constructors and destructors for RgbdPlane

* declared constructors and destructors of RgbdPlane

* definitions written

* tests for python bindings added
2019-11-19 21:43:02 +03:00
Alexander Alekhin
c5e0fa982d Merge pull request #2353 from alalek:python_fix_arginfo 2019-11-19 13:24:40 +00:00
cudawarped
53b9880f8e Merge pull request #2180 from cudawarped:example_fix_for_cudacodec
OpenCV fix 14774 breaks cudacodec

* Example to describe comilation issue

* Added required changes, builds with -DWITH_FFMPEG=ON|OFF

* Working with standard ffmpeg cap.

* Changed cudacodec to use new retrieveRaw() function, to retrieve the raw encoded bitstream, from the videoio module  instead of its own implementation.

* Fix cv::cudacodec::VideoWriter

* Update to use VideoContainer

* Remove header used in testing

* Remove warning

* remove dependence on redundant ffmpeg codecs

* cudacodec: use .set(CAP_PROP_FORMAT, -1) to extract RAW streams

* whitespace

* addressed alalek's comment
2019-11-18 21:02:12 +03:00
Alexander Alekhin
35972a1ec4 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-11-18 07:19:57 +00:00
Alexander Alekhin
d1fc1c64d4 Merge pull request #2342 from alalek:issue_9863 2019-11-18 01:39:04 +03:00
Alexander Alekhin
62c969dd97 Merge pull request #2349 from alalek:fix_contrib_2346 2019-11-16 17:36:40 +00:00
Alexander Alekhin
47de8dd38f python: force using of ArgInfo 2019-11-15 19:16:28 +03:00
Alexander Alekhin
ad8f00017a typo 2019-11-13 19:58:48 +03:00
Alexander Alekhin
22f0ea0cb3 ximgproc: avoid data race in StructuredEdgeDetection::detectEdges() 2019-11-13 19:57:49 +03:00
Alexander Alekhin
4c5f06128b build: GCC9 compilation 2019-11-12 18:50:43 +03:00
Alexander Alekhin
64961f3794 Merge pull request #2332 from si40wiga:fsr-tutorial 2019-11-12 10:57:40 +00:00
Alexander Alekhin
863d6ad391 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-11-11 19:46:37 +00:00
anna
35de0aa7ca add short tutorial 2019-11-11 19:38:05 +01:00
RAJKIRAN NATARAJAN
6ae9809b2e Merge pull request #2178 from saskatchewancatch:opencv_contrib_edgeboxes_testimage
Add test for ximgproc/edgeboxes and fix up Python sample to work with returning scores

* Test for Edgeboxes implementation

* Fix and enhance edgeboxes_demo.py

* Make double literal a float literal

* Address review feedback
2019-11-11 15:19:32 +03:00
Alexander Alekhin
f452bd49e4 update tests (gaussianBlur fix) 2019-11-08 19:21:28 +03:00
czgdp1807
7a0ddd820a [moved from opencv] removed typo
original commit: 07ef08e966
2019-11-06 17:15:31 +05:30
Gagandeep Singh
61cbb44539 Merge pull request #2336 from czgdp1807:issue-2333
* corrected scope of CV_Error()

* removed the return statement
2019-11-10 12:34:18 +03:00
Alexander Alekhin
3146e4a46d Merge pull request #2335 from paroj:ovisup 2019-11-08 18:14:22 +00:00
Pavel Rojtberg
29d8e6854f ovis: add createTriangleMesh method
to create a mesh from arbitrary sources
2019-11-08 18:20:55 +01:00
Alexander Alekhin
91859e8112 Merge pull request #2320 from xerus:separate 2019-11-04 14:18:33 +00:00
Alexander Alekhin
abfcde006f Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-11-04 09:55:01 +00:00
Gael Colas
277c4be95a [moved from opencv] Merge pull request opencv/opencv#15821 from ColasGael:colasg-viz-color
Fix wrong definition of viz::Color::navy()
original commit: e65b51ca3c
2019-11-01 22:37:34 +03:00
si40wiga
e67653eafc Merge pull request #2296 from si40wiga:fsr-inpaint
* new algorithm Rapid Frequency Selective Reconstruction (FSR) added

* fix compiler warning

* applied changes suggested in alalek's review

* fix trailing whitespace

* xphoto: update inpaint() test

* fix pre-processing of error mask

* xphoto: move inpainting FSR algorithm into a separate file

* xphoto: cleanup inpaining documentation

* xphoto: inpainting fsr - avoid uninitialized values
2019-11-02 21:42:46 +03:00
Alexander Alekhin
cd95a5f029 Merge pull request #2312 from kokerf:master 2019-11-01 18:29:43 +00:00