mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-21 05:28:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,711 Commits 6 Branches 127 Tags 3 GiB
3af1b6ecdc
Commit Graph

26711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Alekhin
3bbe5d3956 Merge pull request #13592 from tdp2110:master 2019-01-09 14:42:57 +00:00
Alexander Alekhin
fd674b85bb Merge pull request #13600 from dkurt:fix_13576 2019-01-09 14:02:59 +00:00
Alexander Alekhin
facd5988ce Merge pull request #13599 from dkurt:dnn_conv_error_msg 2019-01-09 14:02:14 +00: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
Alexander Alekhin
a9c1af39d6 Merge pull request #13571 from paroj:jsaruco 2019-01-09 13:59:49 +00:00
Alexander Alekhin
5f419c014f Merge pull request #13583 from qchateau:fix_13582 2019-01-09 13:38:57 +00:00
Alexander Alekhin
b11566bfc7 Merge pull request #13553 from luctowers:master 2019-01-09 13:33:45 +00:00
CUI Hao (Lab)
e5e1ba3c97 Fix typo in core+RotatedRect.java 2019-01-09 16:30:54 +03:00
Alexander Alekhin
ebe14fa4ac Merge pull request #13587 from catree:add_matplotlib_colormaps 2019-01-09 13:30:21 +00:00
Alexander Alekhin
3da8b4ccad Merge pull request #13591 from scramsby:fix-unicode-errors 2019-01-09 13:25:14 +00:00
Alexander Alekhin
e986ff46f7 Merge pull request #13596 from nglee:dev_RemoveCudaIncludeWarningMsg 2019-01-09 13:23:54 +00:00
Dmitry Kurtaev
62199df815 Fix edge_detection.py sample for Python 3 2019-01-09 15:28:10 +03:00
Lucas Towers
9cc12ff0ac Fix improper defining of CV_XADD when using Intel C++ 2019-01-09 14:41:21 +03:00
Dmitry Kurtaev
d0504c95f4 Add a text message for Convolution layer's input channels check 2019-01-09 13:10:19 +03:00
Thomas Peters
e8ac3ea9ea fix implicit fallthrough warning. 2019-01-08 09:49:45 -05:00
Namgoo Lee
4b4874e67a Remove build warning msg with CUDA10.0 2019-01-08 10:57:12 +09:00
Scott Ramsby
7d0d6cd5ee Fix build error when building with Unicode on Windows 2019-01-07 10:18:58 -08:00
catree
d745af6763 Add Matplotlib Perceptually Uniform Sequential colormaps (viridis, plasma, inferno, magma, cividis, twilight and twilight shifted). 2019-01-06 22:48:06 +01:00
Quentin Chateau
ed7607935e Do not compute gains when no images overlap 2019-01-05 16:39:09 +01:00
Alexander Alekhin
78da679472 Merge pull request #13555 from qchateau:nr_blocks_gain_filtering_iterations 2019-01-04 12:12:35 +00:00
Lee Jaehwan
71aee662bd Merge pull request #13544 from eightco:bugfix 
Fix a bug in cv :: merge when array of 3-channel mat is input (#13544)

* Mat merge function bug fix - Bug fix of merge function of 3-channel vector <Mat> of 3 or 4 matrices

* Add Core_merge test for opencv#13544

* fixups
 2019-01-04 15:10:50 +03:00
Pavel Rojtberg
2f89158339 js: allow building with basic aruco functionality 2019-01-03 19:04:00 +01:00
Pavel Rojtberg
27d15894d8 js: allow building without dnn 2019-01-03 18:50:36 +01:00
Alexander Alekhin
79e13be04c Merge pull request #13566 from qchateau:fix_13563 2019-01-03 12:15:54 +00:00
Quentin Chateau
c72a855214 Fixed uninitialized value and naming 2019-01-02 22:06:29 +01:00
Alexander Alekhin
fd08d0d80d copyright: 2019 2019-01-02 01:20:38 +00:00
Alexander Alekhin
14d943f588 copyright: 2019 2019-01-02 01:18:04 +00:00
Quentin Chateau
d93ec07dd8 Setter/getter for number of gain filtering iterations 2018-12-31 18:52:47 +01:00
Quentin Chateau
6b96512d46 Merge pull request #13532 from Tytan:channel_exp_comp 
Channels exposure compensators (#13532)

* feed compatible with single channel images

* Simplified BlockGainCompensator::apply

* ChannelsCompensator

* BlocksChannelsCompensator

* Make source level compatibility detector happy
 2018-12-28 13:53:46 +03:00
Alexander Alekhin
a9cf01113a Merge pull request #13534 from mshabunin:fix-external-ffmpeg 2018-12-28 10:51:12 +00:00
Alexander Alekhin
85ade61ef7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-12-27 18:15:50 +03:00
WuZhiwen
3d44e9ad92 Merge pull request #13520 from wzw-intel:hang 
* dnn/Vulkan: fix GPU hang for heavy convolution tasks

Intel i915 driver will declare GPU hang if the compute shader
takes too long to complete. See
https://bugs.freedesktop.org/show_bug.cgi?id=108947 for details.

The idea in this commit is to divide heavy task into several light
ones and run compute shader multiple times to make each run take
short time enough.

TODO: Add more efficient compute shader

Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>

* dnn/Vulkan: add a more efficient conv shader
 2018-12-27 15:06:44 +03:00
Maksim Shabunin
a8fb72a807 Fixed standalone FFmpeg search with pkg-config 2018-12-27 14:40:44 +03:00
Maksim Shabunin
73959fed45 Merge pull request #13422 from mshabunin:split-videoio-cmake 
* Split videoio dependencies search into pieces, removed obsolete backends
 2018-12-26 15:50:20 +03:00
Alexander Alekhin
5f2fed0e25 Merge pull request #13453 from crackwitz:w32-opengl-mouse-position 2018-12-26 12:38:59 +00:00
Alexander Alekhin
caa3633cbf Merge pull request #13451 from crackwitz:gdi-off-by-one 2018-12-26 12:10:09 +00:00
Christoph Rackwitz
deb8ba2237 fix for #4990: highgui w32 ogl: correct calculation of image coordinates from window coordinates 2018-12-26 15:00:39 +03:00
Alexander Alekhin
e267342108 Merge pull request #13504 from Tytan:stitcher_result_mask 2018-12-26 10:27:38 +00:00
Quentin Chateau
757411bffc Merge pull request #13503 from Tytan:gain_comp_multi_feed 
Stitching: multi-feed on gain and block compensator (#13503)

* multi-feed on gain and block compensator

* ABI compatibility
 2018-12-26 10:24:38 +03:00
Alexander Alekhin
7d69289092 Merge pull request #13511 from knsong:3.4 2018-12-26 07:23:49 +00:00
Alexander Alekhin
c9dfcc4de8 Merge pull request #13492 from terfendail:matx_addition 2018-12-26 07:23:30 +00:00
Christoph Rackwitz
beba82b22b Off-by-ones in windows/GDI window calculations 
Check for "gutter" around displayed image. there was one row/column missing on the bottom/right.
Might as well set gutter = 0?
 2018-12-25 17:54:44 +01:00
Vitaly Tuzov
cd169941f2 Added test for addition of Mat and Matx 2018-12-25 19:22:04 +03:00
Vitaly Tuzov
c8f59bf1e0 Fixed operations on Mat and Matx simultaneously 2018-12-25 19:22:09 +03:00
Dmitry Kurtaev
ff8c53ea20 Merge pull request #13481 from dkurt:fix_13227 
* Fix drawMatches and drawKeypoints for BGRA input images

* keep BGRA too

* Combine different input types for drawMatches test
 2018-12-25 17:29:12 +03:00
Alexander Alekhin
148aee31e4 Merge pull request #13486 from allnes:dnn_rework 2018-12-25 14:27:45 +00:00
Alexander Nesterov
a208c3bf04 Fix openpose samples 2018-12-25 14:12:44 -01:00
Alexander Alekhin
d9089741bc Merge pull request #13524 from terfendail:filter_unroll 2018-12-25 14:26:59 +00:00
Vitaly Tuzov
7beb24553a Speedup filter2d by loop unrolling 
Added filter2d tests for 16S
 2018-12-25 14:40:48 +03:00
Alexander Alekhin
6142b21dd5 Merge pull request #13518 from wzw-intel:test_vulkan 2018-12-24 16:49:45 +00:00