Alexander Alekhin
e058febaad
Merge pull request #13441 from paroj:capimg
2018-12-14 15:41:40 +00:00
Alexander Alekhin
0a801354b1
Merge pull request #13438 from madan-ram:patch-2
2018-12-14 14:35:56 +00:00
Pavel Rojtberg
d7f60f69f1
videoio: fix CAP_IMAGES
...
broken in 11eafca3e2
2018-12-14 15:32:33 +01:00
Rostislav Vasilikhin
d99a4af229
Merge pull request #13379 from savuor:color_5x5
...
RGB to/from Gray rewritten to wide intrinsics (#13379 )
* 5x5 to RGB added
* RGB25x5 added
* Gray2RGB added
* Gray2RGB5x5 added
* vx_set moved out of loops
* RGB5x52Gray added
* RGB2Gray written
* warnings fixed (int -> (u)short conversion)
* warning fixed
* warning fixed
* "i < n-vsize+1" to "i <= n-vsize"
* RGBA2mRGBA vectorized
* try to fix ARM builds
* fixed ARM build for RGB2RGB5x5
* mRGBA2RGBA: saturation, vectorization
* fixed CL implementation of mRGBA2RGBA (saturation added)
2018-12-14 17:01:01 +03:00
Alexander Alekhin
4b33910449
Merge pull request #13428 from rgarnov:gapi_add_kernels_pass_stage
2018-12-14 12:30:36 +00:00
Madan Ram
c1e9a7ee4b
Update template_matching.markdown
...
Replaced CV_TM_SQDIFF to TM_SQDIFF and the rest since methods are renamed in opencv 3.4
2018-12-14 16:34:58 +05:30
Alexander Alekhin
82a02d8585
Merge pull request #13436 from alalek:cmake_with_msmf_dxva_3.4
2018-12-14 10:36:39 +00:00
Alexander Alekhin
8d907d2e32
cmake(java): add OPENCV_JAVA_SOURCE_VERSION/OPENCV_JAVA_TARGET_VERSION
2018-12-14 00:15:57 +00:00
Alexander Alekhin
0c16d8f6c3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-13 15:12:26 +03:00
Alexander Alekhin
b7bb79c7c8
videoio(MSMF): backport WITH_MSMF_DXVA flag
2018-12-13 14:56:20 +03:00
Ruslan Garnov
5340073770
Removed UNUSED macro
2018-12-13 14:39:33 +03:00
Vitaly Tuzov
3903174f7c
Merge pull request #13334 from terfendail:histogram_wintr
...
* added performance test for compareHist
* compareHist reworked to use wide universal intrinsics
* Disabled vectorization for CV_COMP_CORREL and CV_COMP_BHATTACHARYYA if f64 is unsupported
2018-12-13 14:20:22 +03:00
Alexander Alekhin
a9771078df
Merge pull request #13427 from dkurt:dnn_onnx_dynamic_reshape
2018-12-13 11:15:51 +00:00
Alexander Alekhin
eb1f7797e4
Merge pull request #13387 from dkurt:dnn_minor_ie_fixes
2018-12-13 10:08:34 +00:00
Alexander Alekhin
aa666dfa9c
Merge pull request #13430 from tomoaki0705:fixCudaJetsonTX2file
2018-12-13 09:14:26 +00:00
Tomoaki Teshima
3e710d8eec
use correct CC value for Jetson Xavier
2018-12-13 13:35:19 +09:00
Alexander Alekhin
384ac63490
Merge pull request #13425 from alalek:issue_13277
2018-12-12 16:21:46 +00:00
Alexander Alekhin
954098d1cb
Merge pull request #13423 from alalek:issue_13418
2018-12-12 15:38:47 +00:00
Dmitry Kurtaev
e71758cfdf
Operate with shapes in ONNX models
2018-12-12 18:34:22 +03:00
Alexander Alekhin
cea3289bd4
Merge pull request #13420 from ThadHouse:Windows7shlwapi
2018-12-12 14:58:51 +00:00
Adrian Kashivskyy
00285a5e88
Merge pull request #13424 from akashivskyy:pr/ios-nonfree
...
Add ability to build iOS and macOS frameworks with nonfree modules (#13424 )
* Allow building ios framework with nonfree
* Allow building osx framework with nonfree
2018-12-12 17:32:19 +03:00
Ruslan Garnov
d38676085a
Added "kernels" pass stage to compiler, removed unused opaque from cv::gimpl::Op
2018-12-12 17:22:52 +03:00
Alexander Alekhin
d8583b2c7a
dnn: fix vulkan backend builds with Clang
2018-12-12 15:25:39 +03:00
Alexander Alekhin
82227b5ace
Merge pull request #13419 from seanm:SemiWarnings
2018-12-12 11:07:00 +00:00
Alexander Alekhin
6fa23f330f
cmake: fix compiler flags filtering
2018-12-12 13:35:43 +03:00
Alexander Alekhin
c8f934b5b1
Merge pull request #13415 from alalek:issue_13406
...
* python: add checks for drawKeypoints() symbol
* python: more hacks in hdr_parser.py
2018-12-12 13:26:31 +03:00
Thad House
857fba0878
Remove MinCore_Downlevel, replace with Shlwapi
...
On windows 7, MinCore_Downlevel does not work correctly. However, the only API used was QISearch, which can be found in Shlwapi.
Closes #12010
2018-12-11 17:06:01 -08:00
Sean McBride
a4111fab39
Fixed -Wextra-semi warnings in public headers
2018-12-11 14:45:27 -05:00
Alexander Alekhin
54de51ef3c
Merge pull request #13416 from alalek:avoid_cv2_in_docs
2018-12-11 17:47:41 +03:00
Alexander Alekhin
0915df5b18
python: don't use 'cv2.' in documentation
2018-12-11 16:05:12 +03:00
Dmitry Kurtaev
53f6198f27
Minor fixes in IE backend tests
2018-12-10 20:08:13 +03:00
Maksim Shabunin
81e7c7d8c8
OpenVINO version bump
2018-12-10 14:44:53 +03:00
Alexander Alekhin
ea64e860de
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-09 13:21:58 +00:00
Rijubrata Bhaumik
e70786e05e
Merge pull request #13300 from riju:photoModule
...
* Enable Javascript bindings for photo module.
1. Enable the build flag in build_js.py.
2. Append js into WRAP list of photo’s CMakefiles.txt
3. Add photo module's API into JS API whitelist (embindgen.py)
Exposing the HDR imaging part of photo module.
[TODO]
Add tests
Fix opencv/doc/js_tutorials/
* [WIP] TODO: Add tests
* Remove TonemapDurand: algorithm patented in US, so moved to opencv_contrib
* Fix ningxin's comment: expose the base class.
* Add some more simple binding tests.
Also expose process function
2018-12-09 15:08:59 +03:00
LaurentBerger
f1dc26d7ce
Merge pull request #13382 from LaurentBerger:imreadsize
...
* try to solve #13381
* Add note
2018-12-09 15:05:27 +03:00
Alexander Alekhin
40a53e3d64
Merge pull request #13388 from alalek:ocl_fix_perf_stitching
2018-12-08 17:51:47 +00:00
Alexander Alekhin
e5f298cca5
Merge pull request #13385 from alalek:cmake_cleanup_build_junk_dir
2018-12-08 17:51:09 +00:00
Alexander Alekhin
85b1750660
Merge pull request #13316 from alalek:cmake_fix_baseline_detect
2018-12-08 17:50:03 +00:00
Alexander Alekhin
92e86292dd
Merge pull request #13389 from dkurt:dnn_tf_eltwise_sub
2018-12-07 13:54:09 +00:00
Maksim Shabunin
05131af8da
Merge pull request #13367 from mshabunin:cmake-verify
...
* Added dependency verification mechanism for cmake
2018-12-07 15:57:25 +03:00
Dmitry Kurtaev
8422dda2c7
Element-wise subtraction from TensorFlow
2018-12-07 13:38:05 +03:00
Alexander Alekhin
606622ab36
stitching(perf): increase threshold of transform vector
2018-12-07 13:22:39 +03:00
Alexander Alekhin
d77612fe70
cmake: hide 'junk' dir from the root of build directory
...
moved to CMakeFiles (no conflicts are expected)
2018-12-07 05:14:08 +00:00
Alexander Alekhin
cab15f6c5e
Merge pull request #13377 from dkurt:hotfix_dnn_ie_master
2018-12-06 15:11:09 +00:00
Alexander Alekhin
492a072ea8
Merge pull request #13376 from dkurt:hotfix_dnn_ie
2018-12-06 15:09:51 +00:00
Alexander Alekhin
e82e672a93
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-06 07:06:58 +00:00
Dmitry Kurtaev
93971a53d9
Exclude Input layer from list of outputs for IE networks
2018-12-06 09:12:05 +03:00
Dmitry Kurtaev
3868cb44f1
Exclude Input layer from list of outputs for IE networks
2018-12-06 09:08:50 +03:00
Alexander Alekhin
6fbf6f8bea
Merge pull request #13359 from dkurt:dnn_keras_pad_concat
2018-12-05 19:48:58 +00:00
Alexander Alekhin
e090ea3efd
Merge pull request #13370 from alalek:ocl_update_perf_stitching_matchers_threshold
2018-12-05 19:46:12 +00:00
