Alexander Alekhin
eda4575e4f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-13 20:00:25 +00:00
Alexander Alekhin
f6d0e94ec8
Merge pull request #2088 from alalek:issue_2084
2019-04-12 18:54:18 +00:00
Alexander Alekhin
bc081719bc
Merge pull request #2080 from paroj:aruco_axes
2019-04-11 16:17:14 +00:00
Alexander Alekhin
01cfda40eb
Merge pull request #2079 from paroj:ovisres
2019-04-11 15:17:44 +00:00
Alexander Alekhin
429418ebea
text: fix build on windows
...
avoid broken min/max macros from tesseract headers
2019-04-11 17:28:06 +03:00
Pavel Rojtberg
0f030dd002
aruco: forward drawAxis to drawFrameAxes
2019-04-10 11:19:59 +02:00
Pavel Rojtberg
310ca2b4a3
ovis: addResourceLocation - only retain unique locations
2019-04-09 11:30:19 +02:00
Alexander Alekhin
2c32791a9c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-05 19:01:13 +00:00
Alexander Alekhin
f26c98365d
Merge pull request #2065 from JulianSeuffert:master
2019-04-05 14:10:51 +00:00
Julian Seuffert
826b77e567
ximgproc: Fix support for CV_32F WLS Filter
...
If the disparity maps have the depth CV_32F, they are wls-filtered
in `DisparityWLSFilterImpl::filter` but the result is not saved in the
OutputArray of the method. Now, the result is copied to that array.
2019-04-05 14:48:45 +02:00
Alexander Alekhin
c8ed08d0a2
Merge pull request #2058 from shimat:fix_superres_typo
2019-03-29 13:29:24 +00:00
shimat
9a5f442dd4
fix SuperResolution::getLabmda/setlabmda typo
2019-03-27 09:08:42 +09:00
JoeHowse
b7e785233c
Merge pull request #2046 from JoeHowse/master
...
Minor changes to the quality module to support Visual Studio 2013 (#2046 )
* quality: revise syntax to support Visual C++ 2013
* quality: changes to standardize constness between Visual C++ 2013 and other compilers
2019-03-23 20:20:20 +03:00
Alexander Alekhin
f2618a4ed4
Merge pull request #2033 from cv3d:python/surface_matching
2019-03-22 19:29:25 +03:00
Alexander Alekhin
fd2ca91943
Merge pull request #2015 from krshrimali:krshrimali-patch-brisque
2019-03-18 18:53:21 +00:00
clunietp
ebad13e0ba
Updated to use OpenCV ML, removed libsvm. Updated model, tests and documentation. Provided cpp samples for model training and evaluation.
...
Fixes for warnings
Improved BRISQUE documentation
Fixed documentation typo
2019-03-16 21:23:40 +00:00
kushashwa ravi shrimali
4c2f5135dd
BRISQUE commit
...
Minor edits
minor edits
double* to vector<data>
Updates: BRISQUE and Python
Added BRISQUE and Python Samples
Minor edits
Final edits: BRISQUE
Final edits: BRISQUE
Copyright notice added
deleted .vscode
Warnings rectified. Added CV_Assert
Final Commit: BRISQUE
Removed whitespaces. Corrected array initializations and override warnings
Removed whitespaces
Resolved array initialization
Override warning
Mac build resolved
Added bibliography and corrected Mac/Android/iOS warnings
Rollback changes
Added BRISQUE bib
Solves Mac/iOS/Android warnings
Removed trailing whitespaces
Updated sample code for BRISQUE C++
Fixes for Win32, Win64
Warnings removed
trailing whitespaces
Trailing whitespace removed
2019-03-16 21:22:39 +00:00
clunietp
476167ed81
BRISQUE initial commit
...
Set BRISQUE expected scores from original impl
Added BRISQUE models and interface, test methods
[alalek] drop changes from libsvm files
2019-03-16 21:19:49 +00:00
Alexander Alekhin
7753b5930e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-15 17:51:12 +00:00
Alexander Alekhin
6d16876ee2
Merge pull request #2042 from paroj:ovis_env
2019-03-14 21:53:35 +00:00
Alexander Alekhin
2b40a4e60d
Merge pull request #2038 from utkarshg6:3.4
2019-03-14 21:49:39 +00:00
Pavel Rojtberg
5ed21bb2ea
ovis: document the supported environment variables
2019-03-14 14:42:54 +01:00
Alexander Alekhin
f0e70cbfd5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-13 19:17:21 +00:00
Alexander Alekhin
617466c18f
Merge pull request #2039 from paroj:ovis_vsync
2019-03-13 19:17:01 +00:00
Alexander Alekhin
f9a8f0edbe
Merge moved code from opencv
2019-03-13 19:04:55 +00:00
Richard Veale
02645345c3
[moved from opencv] Merge pull request opencv/opencv#13695 from flyingfalling:3.4
...
* Fixed bug that made cuda::filter give corrupted output when different filters called in different threads. This was due to use of global texture variable shared by all filters.
* REV: fixed tab issue for opencv coding style...
original commit: 8158e5b7a0
2019-03-13 20:53:59 +03:00
Pavel Rojtberg
f23d1e9c16
ovis: allow disabling VSYNC - useful in multiwindow scenarios
...
or with batch rendering
2019-03-13 16:54:58 +01:00
Namgoo Lee
90d1627194
[moved from opencv] Move Ptr-related code from lut.cu to lut.cpp
...
original commit: a54affeb8d
2019-03-13 20:25:28 +09:00
utkarshg6
bc0e250216
Changed mismatch grayscale to image with 3 channels
2019-03-13 15:58:50 +05:30
Hamdi Sahloul
e5763fae4b
A pythonic interface for surface_matching module
2019-03-12 22:05:55 +09:00
Alexander Alekhin
75fcfa6093
Merge pull request #2028 from tomoaki0705:fixCudaImgProcFailure
2019-03-08 16:26:22 +00:00
Tomoaki Teshima
a6b3254db9
fix test failure of CUDA_ImgProc
...
* update the coefficient value
2019-03-06 18:56:00 +09:00
Alexander Alekhin
6f5d9835ba
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-05 17:16:56 +00:00
Alexander Alekhin
debdc26b86
Merge moved code from opencv
2019-03-05 17:16:03 +00:00
Alexander Alekhin
9e190bcd81
Merge pull request #2024 from alalek:backport_bindings_generator
2019-03-05 17:15:57 +03:00
Alexander Alekhin
1756e82bdd
bindings: backport generator from OpenCV 4.x
2019-03-05 16:39:56 +03:00
Namgoo Lee
02b3d77b7b
[moved from opencv] CUDA 10.1 Build Issue Fix
...
original commit: 5a2faab2e6
2019-03-03 16:40:43 +00:00
Alexander Alekhin
536f6a935a
Merge pull request #2020 from alalek:line_descriptor
2019-03-01 20:55:34 +00:00
Hamdi Sahloul
4e3c8189a5
Fix enum wrapper
2019-03-01 19:04:41 +00:00
Alexander Alekhin
e990caef8d
line_descriptor: remove code with conflict license
2019-03-01 18:56:35 +00:00
Alexander Alekhin
33f18dd60b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-26 15:41:56 +03:00
Alexander Alekhin
f65010eadc
Merge moved code from opencv
2019-02-26 14:43:36 +03:00
Maksim Shabunin
b6767ccc43
Merge pull request #2011 from mshabunin:enable-narrowing-warning
...
* Fixed type narrowing issues
2019-02-26 13:15:23 +03:00
Namgoo Lee
cade19501f
[moved from opencv] cudev - Rework some code
...
- Use shfl_down, instead of __shfl_down, on warp scan
- Remove race conditions
original commit: 2b6be3cb0f
2019-02-25 13:46:32 +09:00
Alexander Alekhin
4ed97c511e
Merge pull request #2007 from tedsteiner:features2d-without-highgui
2019-02-21 16:05:40 +00:00
Ted Steiner
fe71b09f88
sfm module calls imread function, which is in imgcodecs module
...
This built correctly before because tests were run with the highgui module enabled.
The sfm module links against the features2d module, which brings in the highgui module as an optional target if enabled.
Through this path, imread was working correctly despite the file including the wrong header and not declaring its linking dependency.
2019-02-19 19:56:32 -05:00
Alexander Alekhin
ca7cb77a7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-19 19:31:28 +00:00
Alexander Alekhin
7e569cec58
Merge moved code from opencv
2019-02-19 19:31:16 +00:00
Sreejith S
412fd442b2
Merge pull request #2005 from sreejithsankar55:tempo
...
* Fixed typo
* Resolved the typo and trailing space error
2019-02-19 22:24:18 +03:00
Namgoo Lee
71f588bd8e
[moved from opencv] cuda::StereoBM - fix hanging and racing issue
...
- Fix hanging issue on 2080 Ti
- Fix racing issue
original commit: 1a961660d8
2019-02-18 06:03:12 +00:00
