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
Alexander Alekhin
a618d8bc9e
stitching(perf): update test threshold
2018-12-05 18:59:30 +00:00
Tsukasa Sugiura
09b3dcb6db
Merge pull request #13341 from UnaNancyOwen:fix_librealsense
...
* videoio(librealsense): fix pipeline start with config
fix to apply pipeline settings by passing config to start.
* videoio(librealsense): add support get props
add support get some props.
2018-12-05 20:12:25 +03:00
Alexander Alekhin
f26e86e4d8
Merge pull request #13369 from alalek:fixup_13332
2018-12-05 17:02:02 +00:00
Alexander Alekhin
9ff1c39daa
dnn: fixup available backends/targets
2018-12-05 19:19:17 +03:00
okriof
ef42baf9f0
Merge pull request #13361 from okriof:brisk_getset
...
* Get/Set functions for BRISK parameters, issue #11527 .
Allows setting threshold and octaves parameters after creating a brisk object. These parameters do not affect the initial pattern initialization and can be changed later without re-initialization.
* Fix doc parameter name.
* Brisk get/set functions tests. Check for correct value and make tests independent of default parameter values.
* Add dummy implementations for BRISK get/set functions not to break API in case someone has overloaded the Feature2d::BRISK interface. This makes BRISK different from the other detectors/descriptors on the other hand, where get/set functions are pure virtual in the interface.
2018-12-05 18:44:23 +03:00
Maksim Shabunin
fe459c82e5
Merge pull request #13332 from mshabunin:dnn-backends
...
DNN backends registry (#13332 )
* Added dnn backends registry
* dnn: process DLIE/FPGA target
2018-12-05 18:11:45 +03:00
Alexander Alekhin
cdf906b233
Merge pull request #12945 from terfendail:core_wintr_full
2018-12-05 12:52:03 +00:00
Alexander Alekhin
ead7bc883d
Merge pull request #13364 from nglee:dev_FixLineIteratorExample
2018-12-05 10:09:48 +00:00
Alexander Alekhin
e55ad25355
Merge pull request #13363 from kartikmohta:patch-1
2018-12-05 09:50:09 +00:00
Alexander Alekhin
838624bf53
Merge pull request #13362 from alalek:photo_move_durand_contrib
2018-12-05 09:46:30 +00:00
Namgoo Lee
83c7dfb6a4
Fix error in LineIterator example code in doc
2018-12-05 11:31:19 +09:00
Kartik Mohta
80a3d7bffa
Fix comment marker in OpenCVDetectCudaArch.cu
2018-12-04 11:47:28 -08:00
Dmitry Kurtaev
c9e0c77d73
Concat layer from TensorFlow with constant inputs
2018-12-04 19:41:40 +03:00
Alexander Alekhin
742f22c09b
photo: move TonemapDurand to opencv_contrib
2018-12-04 18:59:27 +03:00
Maksim Shabunin
6481397710
Merge pull request #13358 from terfendail:disflow_warn
2018-12-04 14:21:43 +00:00
Vitaly Tuzov
6ad8a9c09d
Replaced core module calls to universal intrinsics with wide universal intrinsics
2018-12-04 16:24:20 +03:00
Vitaly Tuzov
388ccda85d
Fixed static analyzer warnings in DISOpticalFlow
2018-12-04 12:57:14 +03:00
Alexander Alekhin
2e0150e601
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-03 18:38:27 +03:00
Alexander Alekhin
aee865fec9
Merge pull request #13352 from alalek:issue_13324
2018-12-03 15:34:23 +00:00
Alexander Alekhin
2dc5e245d0
Merge pull request #13350 from alalek:fix_kw_gapi
2018-12-03 15:16:45 +00:00
Alexander Alekhin
ea3a5950a3
Merge pull request #13346 from alalek:fix_kw_persistence
2018-12-03 15:16:31 +00:00
Alexander Alekhin
0d439a9879
Merge pull request #13351 from mshabunin:fix-va-compile
2018-12-03 15:15:55 +00:00
Alexander Alekhin
99f6f8ea9d
Merge pull request #13348 from alalek:kw_videoio_v4l
2018-12-03 14:45:03 +00:00
Alexander Alekhin
39e448f7be
Merge pull request #13347 from alalek:kw_resize_check
2018-12-03 14:44:41 +00:00
Alexander Alekhin
80c2adbda1
core: add getcwd() stub
2018-12-03 17:38:57 +03:00
Maksim Shabunin
c26c43c69c
Fixed compilation with VA-interop on 32-bit platforms
2018-12-03 17:16:09 +03:00
Alexander Alekhin
4e8311085f
core(persistence): fix KW issues
2018-12-03 17:10:20 +03:00
Alexander Alekhin
cf0be1a0af
Merge pull request #13349 from mshabunin:fix-highgui-test
2018-12-03 13:06:09 +00:00
Alexander Alekhin
26d2095dd6
videoio(v4l): initialize members in ctor
2018-12-03 15:22:20 +03:00
Alexander Alekhin
c577c2cc6a
gapi: eliminate KW issues
2018-12-03 15:20:47 +03:00
Maksim Shabunin
905d96dd4a
Restored 500ms delay in highgui test
2018-12-03 14:34:29 +03:00
Alexander Alekhin
2d5ccc7b3e
imgproc(resize): update checks (static analyzers)
2018-12-03 13:13:48 +03:00
